small fixes, added elpa
Merge branch 'master' of https://github.com/wolfmanstout/dotfiles