major rewrite: began using emacs prelude, many other small changes
Merge branch 'master' of https://github.com/bbatsov/prelude