Merge pull request #21 from apardo/staging

Staging
Merge branch 'master' of https://github.com/edx/configuration into staging
Merge branch 'staging' of https://github.com/iaen-edu/configuration into staging
Merge branch 'staging' of github.com:iaen-edu/configuration into staging