ack and git tweaks
Merge branch 'master' of github.com:ratbeard/dotfiles