More updates
Merge branch 'cask' of github.com:cesarolea/emacs into cask