don't include elpa
Merge branch 'master' of ssh://github.com/hrs/dotfiles