nginx redirect
Merge pull request #909 from edx/jarv/nginx-redirect-2

nginx redirect
Merge branch 'master' of https://github.com/edx/configuration
Merge branch 'master' of https://github.com/iaen-edu/configuration