Some stuff that was sitting uncommitted on my laptop.
Merge branch 'master' of github.com:ibrahima/dotfiles

Conflicts:
	.emacs.d/init.el