Updated setup.py command Conflicts: docs/source/reference/settings.rst examples/defaultshop/settings.py oscar/tests.py oscar/urls.py