Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH

Feature/bridger/new wiki

Separate caches per-domain-name

Conflicts:
	lms/templates/wiki/settings.html

Fix for 500 on showanswer for choiceresponse

Catch errors in module load

Feature/tomg/fall design

* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None

Fixed syllabus to look good with new courseware styling

Added django-wiki's requirements to requirements.txt, because they weren't being included automatically.

Conflicts:
	cms/static/sass/_base.scss
	repo-requirements.txt

Updated to latest version of django-wiki with lots of deletion fixes. Removed child article list until it can be styled.

Feature/rocky/discussion api key

Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x