vimrc
Merge branch 'master' of https://github.com/justinmk/config

Conflicts:
	.vimrc
Merge branch 'master' of https://github.com/justinmk/config
vimrc: key bindings