Add MELPA, and some packages
Merge branch 'master' of github.com:louisch/dotemacs

Conflicts:
	init.el