Now handles being loaded in emacs 23.x
Merge in code to handle emacs 23.x