add projectile
Merge branch 'master' of github.com:jaypei/emacs.d

Conflicts:
	.gitignore
	lisp/init-python.el