updated to newest projectile master
Merge branch 'master' of github.com:dhaley/dot-emacs