This PR will include the XBlock modifications at edx/XBlock#200 but I have to wait for that to be merged to get a commit sha to put where I put that comment.