Merge branch 'master' of github.com:dustinswan/dotfiles

fish/config.fish

@@ -16,3 +16,5 @@ set -x PATH /usr/local/bin $PATH # Homebrew
 set -x PATH $HOME/.rvm/bin $PATH # RVM
 set -x PATH /Applications/Postgres.app/Contents/MacOS/bin $PATH # Postgres
 set -x PATH $HOME/Library/Haskell/bin $PATH # Haskell
+
+set -x IGVERBOSE 3

oh-my-zsh

@@ -1 +1 @@
-Subproject commit 11034217a7ea3cffe6e0fe631837c518b8c7e1a5
+Subproject commit caa15548c107b9c31f61a67547ffab0b0cfe4934

vim/bundle/vundle

@@ -1 +1 @@
-Subproject commit 03ed2bd39e37c5ff035c05197af81558eb5d8a89
+Subproject commit dd8356aea7499fed92f7c37227b1625a2b3dc190

vimrc

@@ -157,6 +157,8 @@ else
     let g:loaded_syntastic_plugin=1
 endif
 
+nnoremap <leader>s :SyntasticToggleMode<cr>
+
 " Supertab
 " let g:SuperTabDefaultCompletionType="context"
 
@@ -164,10 +166,10 @@ endif
 nnoremap <leader>4 :! p4 edit %<cr>
 
 " open vsplit and switch to it
-nnoremap <leader>w <c-w>v<c-w>l
+nnoremap <leader>v <c-w>v<c-w>l
 
 " trim whitespace
-nnoremap <leader>W :%s/\s\+$//e<cr>
+nnoremap <leader>w :%s/\s\+$//e<cr>
 
 " open Ack
 nnoremap <leader>a :Ack<space>
@@ -180,14 +182,6 @@ nnoremap ! :Clam<space>
 
 " CtrlP
 nnoremap <leader>b :CtrlPBuffer<cr>
+
 " Set the max files
 let g:ctrlp_max_files = 10000
-" Optimize file searching
-"if has("unix")
-    "let g:ctrlp_user_command = {
-                "\   'types': {
-                "\       1: ['.git/', 'cd %s && git ls-files']
-                "\   },
-                "\   'fallback': 'find %s -type f | head -' . g:ctrlp_max_files
-                "\ }
-"endif