Some mods
Merge branch 'master' of https://github.com/MarkkuKovanen/.emacs.d

Conflicts:
	elpa/archives/gnu/archive-contents
	elpa/archives/marmalade/archive-contents