Update vim colors
Merge branch 'master' of https://github.com/dennywright/env

Conflicts:
	.vimrc