Update file.py

Moving the changes rejected from 1699 into 1714
Update test_audit_file.py

moving rejected changes from 1699 to 1714
Update file.py

Moving rejected changes from 1699 to 1714
Merge remote-tracking branch 'origin/master' into 1714-file-object-round3
Fixing the audits, adding the upgrades, fixing the inserts
Fixing test_file_upgrade3 to acutally upgrade to 4
Laurence made a fix so that upgrade_tests did not require modern schemas
Merge remote-tracking branch 'origin/master' into 1714-file-object-round3
Really we want to upgrade from 3 not from 2
Fixing upgrade
Audits need the testapp
Hide replaced files from the experiment page.
(The 'obsolete' state is no more.)
Merge pull request #385 from ENCODE-DCC/1723-hide-replaced

Hide replaced files from the experiment page.
Making small changes to try to fix the upgrade
The paired_with upgrade will be moved to asynchronous.
Merge pull request #384 from ENCODE-DCC/cal_props

Cal props
No really this should be the kent lab
Allow objtemplate to have repeat conditions
Whitespace
Separate out revoked_files to another property.
Add context field to target