Merge branch 'master' of github.com:pibako/emacs-pi

Conflicts:
	init.d/01-packages.el