Fix ack with dispatch
Merge branch 'master' of github.com:jlindsey/vim

Conflicts:
	vimrc