blah
Merge remote-tracking branch 'origin/osx' into osx
Updated submodules
Added colors and snippets to .vim
Merge remote-tracking branch 'origin/osx' into osx

Conflicts:
	.vimrc
Deleting submodules is FUCKING BULLSHIT
Added new vim-slim repo. Thanks for deleting your repo bro
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' into osx

Conflicts:
	.tmux.conf
	.vimrc
	.zshrc
Committed doc tags for vimroom and surround
Merge branch 'master' into osx

Conflicts:
	.vim/bundle/vim-surround
Added osx pastebin"
Updated vimroom to get it out of status
added gccm