We should wait on merging this until https://github.com/edx/XBlock/pull/67 is merged, right?