Fixes system/__init__.py
Fixes scripts/build_usersguide.py
Updates paths in dist/README.md
Fixes paths in pypi.sh
Merge branch 'buildbot-nightly-merge-fixes' into 'buildbot-nightly'