diff --git a/bashrc b/bashrc
index 7b65091..1231a27 100644
--- a/bashrc
+++ b/bashrc
@@ -104,8 +104,14 @@ PATH=$PATH:~/tmp/ucpp/ucpp/
 function tsh(){
   ssh $* -t 'tmux a || tmux || /bin/bash' 
 }
+<<<<<<< Updated upstream
 [[ -s ~/.autojump/etc/profile.d/autojump.sh ]] && source ~/.autojump/etc/profile.d/autojump.sh
 export PATH=~/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:~/tmp/ucpp/ucpp/:~/tmp/ucpp/ucpp/:~/hitchhikers/bin/ucpp/ucpp:~/hitchhikers/bin/ucpp/ucpp
+=======
+. /usr/share/autojump/autojump.sh
+[[ -s /home/stonewareslord/.autojump/etc/profile.d/autojump.sh ]] && source /home/stonewareslord/.autojump/etc/profile.d/autojump.sh
+export PATH=/home/stonewareslord/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp
+>>>>>>> Stashed changes
 alias frcbot='python build'
 
 
diff --git a/vimperatorrc b/vimperatorrc
index 6d97626..979f959 100644
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -8,14 +8,19 @@ noremap gH yHP
 noremap gt :set toolbars=noaddons,nobookmarks,nomenu,tabs,nonavigation<CR>
 noremap gT :set toolbars=noaddons,nobookmarks,menu,tabs,navigation<CR>
 noremap Y i<C-c>
-noremap !! :<Up><CR>
-set animations=true
-"set complete=
-"set hintchars=hjklasdfgyuiopqwertnmzxcvb
-colorscheme vimPgray
-set titlestring=
-set newtab=all
+noremap !! :<Up>
 noremap <C-o> mn'p<Esc>
 noremap <C-i> mp'n<Esc>
 noremap G mpG<Esc>
 noremap gg mpgg<Esc>
+noremap / mp/
+inoremap L $
+inoremap H ^
+vnoremap L $
+vnoremap H ^
+set animations=true
+colorscheme vimPgray
+set titlestring=
+set newtab=all
+"set complete=
+"set hintchars=hjklasdfgyuiopqwertnmzxcvb