follow header conventions more closely

Please see http://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Headers.html