Modularize and fix migrate-upload-data

-Modularize import for person into import_person
-Fix bug with now that results in infinite loop
-Fix bug with original_person=authoritative, now original_person=person
Migration for Activity.subproject field

-Migration so subproject=package+version and type="package_upload"
-Delete fields package and version and their unique constraint b/c subproject
now holds that info and the unique constraint was never used for anything
Add back field version to Activity, removed it from Activity.subproject
Change person.html and view so they work with model changes on subproject

-Fix some variables in person.html that haven't been updated
Used emacs to format person.html

-All changes were purely whitespace
Merge pull request #56 from daveeloo/cleanup

Cleanup

Props to @daveeloo for a very clean set of commits, each of which change just one comprehensible thing.