73a146fbbe
This reverts commit 3d2617983b.
The change was not quite right because the method six provides needs to
have `self` be passed in as well. See the docs here:
https://six.readthedocs.io/#unittest-assertions
Reverting for now and we can fix it in smaller chunks later.
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.