Updates
Merge branch 'master' of github.com:benmills/dotfiles

Conflicts:
	.emacs.d/ac-comphist.dat
	.emacs.d/projectile-bookmarks.eld