diff --git a/vim/vimrc b/vim/vimrc
index d037966..cbd88d4 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -37,8 +37,8 @@ let g:tex_flavor='latex'
     vnoremap L $h
     vnoremap H ^
     "Move to end of line
-    inoremap jk <Esc>A
-    inoremap kj <Esc>A
+    inoremap jk <End>
+    inoremap kj <End>
     "Move to last character of last line
     nnoremap G G$
     vnoremap G G$
@@ -210,7 +210,7 @@ let g:formatter_php = ['formatdef_my_custom_php']
 " These flags don't work for some reason
 " -xn -xc -xl -S
 "Syntastic
-let g:syntastic_java_javac_classpath = "/home/stonewareslord/workspace/FullCourseManager/src:/home/stonewareslord/applications/java/junit-4.12.jar:/home/stonewareslord/applications/java/hamcrest-core-1.3.jar"
+let g:syntastic_java_javac_classpath = "/home/stonewareslord/applications/java/junit-4.12.jar:/home/stonewareslord/applications/java/hamcrest-core-1.3.jar:/home/stonewareslord/git/school/flight-reservations/FlightReservations/src:/home/stonewareslord/git/school/flight-reservations/FlightReservations/test"
 "IndentGuides
 let g:indent_guides_start_level=1
 let g:indent_guides_guide_size=1
@@ -409,4 +409,4 @@ endfunction
 set guifont=Fixed\ Medium\ Semi-Condensed\ 10
 inoremap <Tab> <C-R>=g:UltiSnips_Complete()<cr>
 map <unique> <buffer> <LocalLeader>b <Plug>JavagetsetInsertBothGetterSetter
-map <Leader>a m":Autoformat<CR>:%S/\n\n+/\r/<CR>`"
+map <Leader>a O<Esc>:Autoformat<CR>:%S/\n\n+/\r/<CR>