Updates
Merge branch 'master' of https://github.com/jonasteuwen/emacs.d

Conflicts:
	.smex-items