Committed
Merge branch 'master' of github.com:nuklly/emacs-d

Conflicts:
	init-paren.el
	projectile-bookmarks.eld
	projectile.cache