vim changed mysql mappings.
Various git config changes.
vim: Setup ack as grep alternative.
Stuff.
Merge branch 'master' of github.com:trq/dotfiles

Conflicts:
	vimrc