Return to sender
Merge branch 'master' of https://github.com/dhemmerling/.emacs.d

Conflicts:
	init.el