Don't complain about colorschemes
Merge branch 'master' of github.com:wjlroe/dotfiles

Conflicts:
	vimrc