Encryption and other stuff
Merge branch 'master' of github.com:thx/.emacs.d