cherry: a few config changes

Conflicts:
	.vim/.vimrc
M-d for switching in xmonad
stuff