Update to the latest version of XBlock

Clearly I should actually have added tests for this code.