A few fixes

- Use standard header
- Avoid Emacs 24-only features in order to allow use in Emacs 23
- Remove unused code
Merge pull request #1 from purcell/patch-1

A few fixes