Merge remote-tracking branch 'upstream/develop' into package_kalite
don't need these packages
making small tweaks to the packages included
working around server-not-stopping issue on Windows
fixing bug where we elimiated 'test' dirs, which is used by khan and our caching code
Merge branch 'package_kalite' into update_kalite