edx-west user change: +stvstnfrd

We need to refactor and clean up the user stuff.
Merge branch 'edx-west/release' of github.com:edx/configuration into edx-west/release