Added support for Mac keybindings.
Merge branch 'master' of github.com:rexkerr/vimrc

Conflicts:
	.vimrc