optimize color
Merge branch 'master' of github.com:sixgram/vimimpl

Conflicts:
	vimrcs/basic.vim
	vimrcs/settings.vim
	vimrcs/vimrc