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

Conflicts:
	base/posix/home/.emacs.d/projectile-bookmarks.eld
Update