Fix package setup
Merge branch 'master' of github.com:gpittarelli/emacs.d