Update
Merge branch 'master' of github.com:edran/emacs.d