Updates
Merge branch 'master' of github.com:barrkel/barrkel

Conflicts:
	base/posix/home/.emacs.d/.mc-lists.el
Rollback projectile