Importer changes: Moved entity options to different screen, and by default hide them

entity options are now on the same page as the file upload, hidden under "advanced" and "add/update" is the new default.