Some shorter keys for projectile
Remove copied ace-jump integration with evil

Better integration has since been added to evil proper, use it instead.
Merge branch 'master' of github.com:kluge/emacs.d

Conflicts:
	config/kluge-projectile.el