vim color scheme shennanigans

Conflicts:
	vimrc
use vim for git diffs