Fix various Emacs 24.3 issues.
Merge pull request #97 from cphanson/emacs-24.3-fixes

Fix various Emacs 24.3 issues.