Try to be clever about ack location
Merge branch 'master' of https://github.com/ilkka/dotfiles

* 'master' of https://github.com/ilkka/dotfiles:
  Add php-mode to dependencies
  Add melpa to package archives
  Saner win switch key config