Re-adds file input to item edit view
Merge branch 'master' into aws

Fixes missing file input on item edit
Temporarily changes aws keys to use env vars