diff --git a/.gitmodules b/.gitmodules
index c8fb8bd..75b423b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "vim/vim/bundle/supertab"]
 	path = vim/vim/bundle/supertab
 	url = https://github.com/ervandew/supertab.git
+[submodule "vim/bundle/vim-unimpaired"]
+	path = vim/bundle/vim-unimpaired
+	url = https://github.com/tpope/vim-unimpaired
diff --git a/Xmodmap b/Xmodmap
new file mode 100644
index 0000000..1fc59f2
--- /dev/null
+++ b/Xmodmap
@@ -0,0 +1,15 @@
+clear      lock 
+clear   control
+clear      mod1
+clear      mod2
+clear      mod3
+clear      mod4
+clear      mod5
+keycode      37 = Hyper_L
+keycode      66 = Control_L
+add     control = Control_L Control_R
+add        mod1 = Alt_L Alt_R Meta_L
+add        mod2 = Num_Lock
+add        mod3 = Hyper_L
+add        mod4 = Super_L Super_R
+add        mod5 = Mode_switch ISO_Level3_Shift
diff --git a/vim/bundle/vim-unimpaired b/vim/bundle/vim-unimpaired
new file mode 160000
index 0000000..3a77590
--- /dev/null
+++ b/vim/bundle/vim-unimpaired
@@ -0,0 +1 @@
+Subproject commit 3a7759075cca5b0dc29ce81f2747489b6c8e36a7
diff --git a/vim/vim/bundle/supertab b/vim/vim/bundle/supertab
deleted file mode 160000
index 22aac5c..0000000
--- a/vim/vim/bundle/supertab
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 22aac5c2cb6a8ebe906bf1495eb727717390e62e
diff --git a/vimrc b/vimrc
index 661595c..bfde604 100644
--- a/vimrc
+++ b/vimrc
@@ -5,7 +5,7 @@ execute pathogen#infect()
 """ Syntastic
 " Recommended settings
 set statusline+=%#warning#
-set statusline+=${SyntasticStatuslineFlag()}
+set statusline+=%{SyntasticStatuslineFlag()}
 set statusline+=%*
 
 let g:syntastic_always_populate_loc_list = 1
@@ -13,6 +13,12 @@ let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 0
 
+function! SyntasticCheckHook(errors)
+    if !empty(a:errors)
+        let g:syntastic_loc_list_height = min([len(a:errors), 10])
+    endif
+endfunction
+
 
 """ General Settings
 " Set tabs to 4 spaces
@@ -29,6 +35,9 @@ endif
 set number
 set relativenumber
 
+" Autoindent
+set autoindent
+
 " Syntax highlighting
 syntax enable
 filetype plugin on
@@ -37,9 +46,8 @@ filetype plugin on
 set path+=**
 set wildmenu
 
-
-""" NOTES:
-" AUTOCOMPLETE:
-" - ^x^n for JUST this file
-" - ^x^f for filenames
-" - ^n for anything specified by the 'complete' option
+" Window stuff
+map <C-h> <C-w>h
+map <C-j> <C-w>j
+map <C-k> <C-w>k
+map <C-l> <C-w>l
diff --git a/zprofile b/zprofile
index 9a442d7..c3946d6 100644
--- a/zprofile
+++ b/zprofile
@@ -1 +1,2 @@
+xmodmap ~/.Xmodmap
 gpg2 --quiet --no-tty --batch -d $HOME/.mutt/passwords/dumb.gpg > /dev/null