Update to XBlock w/ cookiecutter template