Improves controller for import

Changes order of if statements to allow import using file stored on the server
after selecting a file to upload.
Fixes experiment new form to allow upload