Various changes
Merge branch 'master' of github.com:sjolsen/emacs

Conflicts:
	.emacs
	.emacs.d/elpa/archives/gnu/archive-contents
	.emacs.d/elpa/archives/marmalade/archive-contents