Make headers conform more closely to Package.el spec

I wanted to give org-octopress a try and was creating recipes for melpa, when they failed. These updates should fix it.

See https://github.com/milkypostman/melpa/pull/594 for more info