Added keymaps
Merge branch 'master' of github.com:nass600/dotfiles

Conflicts:
	vimrc