Making free form company name/description work
Fixing broken tests
More PEP page fixing
Merge branch 'master' into release