Update packages
Merge branch 'master' of github.com:pimeys/emacs.d

Conflicts:
	elpa/archives/gnu/archive-contents
	elpa/archives/gnu/archive-contents.signed
	elpa/archives/marmalade/archive-contents
	elpa/archives/melpa/archive-contents
Update packages