Changed handling of omero configuration file.

Removed the old --cfg option (which defaulted to ~/config.xml), replaced with two args that take a properties style file:
  --replaceconfig to replace an existing config
  --mergeconfig to merge with an existing config

Conflicts:
	omego/upgrade.py
Remove --web arg

No longer needed since it can be handled by --replaceconfig/--mergeconfig, and in any case had a useless default
Fix Upgrading/Installing log message
Workaround missing os.path.samefile on Windows
Merge branch 'omero_config' into windows_fixes+omero_config

Conflicts:
	omego/upgrade.py