Maintenance
Merge branch 'master' of github.com:whysoserious/my-emacs-config

Conflicts:
	elpa/archives/marmalade/archive-contents
	elpa/archives/melpa/archive-contents
	elpa/archives/orgmode/archive-contents