Respond to comments and change migrations
Merge branch 'flowerhack/embargo' of github.com:edx/edx-platform into flowerhack/embargo