Fix to header line for package.el compatibility, and other minor fixes
Merge pull request #1 from purcell/patch-1

Fix to header line for package.el compatibility, and other minor fixes