move color lines up
Merge branch 'master' of github.com:swinman/colorvim

Conflicts:
	colors/desert2.vim