Projectile enhancements.  Override dired keybinds.
Merge branch 'master' of https://github.com/opsound/.emacs.d

Conflicts:
	init.el
Remove trailing ^M s