Improvements to import scenarios (rebased onto develop)



This is the same as gh-730 but rebased onto develop.

----

This PR improves the wording of http://www.openmicroscopy.org/site/support/omero5/sysadmins/import-scenarios.html in response to @pwalczysko's comments on #724. Also minor whitespace fixes.