update .vimrc
removed ack keyboard shortcut
Merge branch 'master' of github.com:dobrite/dotfiles

Conflicts:
	.vim/bundle/supertab
	.vimrc