Make headers conform more closely to Package.el spec

More package header work, for melpa building