Rebase emacs-23 branch

see #30
(Opening PR just to make sure Travis runs)