Check It Out v1.1 (#817)

* Copy-pasting changes for Check It Out v1.1 manually, since something got borked in my working branch for it.

* Fixed merge conflicts to CheckItOut. I'm not even sure why there were merge conflicts to begin with...

* Updated concatenated JS file.