Update colors
Use a few new plugins
Merge branch 'master' of github.com:znation/vimconfig

Conflicts:
	.vimrc
	colors/graphlab.vim