Lots of small changes.
Merge branch 'master' of https://github.com/rdeterre/emacs-init

Conflicts:
	.emacs