squashing commits

devstack to not use pre_supervisor

typo error

Taking out edxapp_pypi_local_mirror, replacing with COMMON_PYPI_MIRROR_URL

Adding back - for white space