added tons of custom keymappings...
Merge branch 'master' of github.com:chiramiso/custom_config

Conflicts:
	.vimrc
merged