Misc reworking of keys.
Merge branch 'master' of github.com:omh/dotfiles

Conflicts:
	vimrc