adding colorscheme to vimrc
Merge branch 'master' of github.com:neagle/.vim

Conflicts:
	vimrc