Really obey the command-line args (used only if in non-interactive mode)
Merge branch 'upgrade_via_install' of github.com:bcipolli/ka-lite into release-idoc

Conflicts:
	kalite/utils/platforms.py
In the case of an upgrade-only, still try to load data / generate a zone, in case one doesn't exist.
Merge branch 'release-idoc' of github.com:learningequality/ka-lite into release-idoc

Conflicts:
	kalite/utils/platforms.py