Reformat into an easy_installable python executable
Update to track HEAD of master