A few little tweaks

Hi! Here are a couple of little changes you might like to incorporate. The biggest is to switch from cl to cl-lib: it mostly just affects the namespace of related functions and macros. `cl-lib` is part of emacs 24, and a backwards-compatible package is provided in GNU ELPA for Emacs 23. :-)