Release

Pulling this in to edx-west's release.  will make a PR for a paper trail