shortcuts
fixed vcsvimdiff
Merge branch 'master' of github.com:gyllstromk/vim

Conflicts:
	syntax/handlebars.vim