clean up vim and zsh settings

Also update submodules.

.gitmodules

@@ -13,6 +13,3 @@
 [submodule "powerline/rainbarf"]
   path = powerline/rainbarf
   url = https://github.com/creaktive/rainbarf.git
-[submodule "vim/spf13-vim"]
-	path = vim/spf13-vim
-	url = https://github.com/spf13/spf13-vim.git

README.md

@@ -1,7 +1,7 @@
 # Configuration Files For *nix Environments
 
 #### Software:
-- vim 7.3+
+- vim 7.4
 - emacs 24
 - tmux 1.8
 - zsh

mongo/mongo-hacker

@@ -1 +1 @@
-Subproject commit df06d5e5714f4e02058e56b648e51ae252e0d718
+Subproject commit 00139de86e8a6739e13b9ba187987c25d87e1fd9

powerline/rainbarf

@@ -1 +1 @@
-Subproject commit e467bbd5fe4c3be31fc21a13f40709f4dc3dbe82
+Subproject commit 483f9a887d079a6d38aa594efc7769216e54fc5f

tmux/tmux-colors-solarized

@@ -1 +1 @@
-Subproject commit 3cdcb9a600e86bb9296b08637bc7347ca5634418
+Subproject commit 8d9edb6f1ace46c655b042532e10c5059d273178

vim/vimrc

@@ -293,6 +293,10 @@ let g:vdebug_options = {
 \ }
 
 
+""""""""" Supertab
+let g:SuperTabDefaultCompletionType = 'context'
+
+
 """"""""" Vim Markdown
 let g:vim_markdown_folding_disabled = 1
 
@@ -301,12 +305,12 @@ let g:vim_markdown_folding_disabled = 1
 "let g:neocomplete#sources#omni#input_patterns = {}
 "let g:neocomplcache_omni_patterns = {}
 
-    " Find merge conflict markers
-    map <leader>fc /\v^[<\|=>]{7}( .*\|$)<CR>
+" Find merge conflict markers
+map <leader>fc /\v^[<\|=>]{7}( .*\|$)<CR>
 
-    " Allow using the repeat operator with a visual selection (!)
-    " http://stackoverflow.com/a/8064607/127816
-    vnoremap . :normal .<CR>
+" Allow using the repeat operator with a visual selection (!)
+" http://stackoverflow.com/a/8064607/127816
+vnoremap . :normal .<CR>
 
 """"""""" Source local scripts/plugins
 for filePath in split(globpath('~/dotfiles/vim/settings', '*.vim'), '\n')

vim/vimrc.bundles

@@ -76,4 +76,5 @@ endif
 Bundle 'tpope/vim-markdown'
 Bundle 'tpope/vim-cucumber'
 Bundle 'quentindecock/vim-cucumber-align-pipes'
+Bundle 'kchmck/vim-coffee-script'
 " }}}

zsh/oh-my-zsh

@@ -1 +1 @@
-Subproject commit c79e5a97a906457d1778197bd4f29640d1917201
+Subproject commit 90c28b786ae8a8013fc5083e9cf941115152c706

zsh/omz-custom/history.zsh

@@ -1,6 +1,6 @@
 ## history
 alias h='history 100'
-## don't show expansions, just execute, e.g. for !! and !$
+## don't show expansions on return, just execute, e.g. for !! and !$
 setopt nohistverify
 ## don't have the same history across tabs/windows
 setopt nosharehistory

zsh/omz-custom/less.zsh

@@ -1 +1,8 @@
+# Default Flags for `less`
+#
+# e = quit at end of file
+# i = searches ignore case, unless there are upper case characters
+# r = display raw control characters (Ctrl-A is ^A)
+# M = verbose `less` prompt
+# X = no init? Read `man` entry to find out more. Leaving it here.
 export LESS='-eirMX'

zsh/omz-custom/tmux.zsh

@@ -1,7 +0,0 @@
-# tmux + vim solarised colours are strange:
-# https://github.com/altercation/solarized/issues/159
-# We need to force a TERM type for tmux
-# Ensure that the terminal emulator also reports TERM as 'screen-256color'
-# Seems to be needed separately for tmuxinator as well
-alias tmux='TERM=screen-256color tmux'
-alias mux='TERM=screen-256color mux'

zsh/omz-custom/tmuxinator.zsh

@@ -1,5 +1,3 @@
-#!/usr/bin/env zsh
-
 # Completion of tmuxinator project names
 if [[ ! -o interactive ]]; then
     return