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