More nifty mappings
moar
Merge branch 'master' of https://github.com/Cheezmeister/dotfiles

Conflicts:
	vimrc