Update to XBlock w/ cookiecutter template
Merge pull request #1813 from cpennington/datajam-enable-cookiecutter

Update to XBlock w/ cookiecutter template