package update
Merge branch 'master' of github.com:martintrojer/.emacs.d