bug fixes relate to re-location to /edx
Merge pull request #743 from edx/e0d/es-bugfixes

bug fixes relate to re-location to /edx