Add projectile mode support
Merge branch 'master' of github.com:timwraight/emacs.d

Conflicts:
	packages.el