New color schemes
Merge branch 'master' of github.com:siimon/dotfiles

Conflicts:
	.gitmodules
	.vimrc