Ack shortcuts
Merge branch 'master' of github.com:pimeys/dotvim

Conflicts:
	vimrc