Add more schemes and minor changes
Merge branch 'master' of https://github.com/stayradiated/vim

Conflicts:
	vimrc