Added colors and snippets to .vim

Conflicts:

	.vimrc
Deleting submodules is FUCKING BULLSHIT
Added new vim-slim repo. Thanks for deleting your repo bro
Added tpope vim-surround
Added coffeescript console.log and slim htmlshim snippets
Added var to let macro
Added vim copy paste to tmux.conf
Updated submodules
Pulled upstream submodules
removed command-T - finally
Tmux conf remove vi, add pop out pane
Merge remote-tracking branch 'origin/new-vim'

Conflicts:
	.tmux.conf
	.vimrc
Merge remote-tracking branch 'origin/master' into new-vim

Conflicts:
	.vim/bundle/vim-surround
Merge branch 'master' into osx

Conflicts:
	.vim/bundle/vim-surround