added a couple of key maps
Merge branch 'master' of github.com:bobisme/dot

Conflicts:
	vimrc