colors
Merge branch 'master' of github.com:aaronzirbes/vim-files

Conflicts:
	vimrc