edx-solutions/edx-platform — pull request #257 by mattdrayer (2014-10-06 18:53:46+00:00)
Title: Mattdrayer/rebase 20140926 cherrypicks

@antoviaque -- this is the running PR for the cherry picks I'm working through -- I'll update the conversation thread after I'm done adding everything