some new mappings
Merge branch 'master' of https://github.com/ryandeba/vimrc

Conflicts:
	.vimrc