adding SSL to VM, closes #318
pass HTTPS status from nginx to Django, closes #322
Pass  from nginx to Django, closes #324
Reworking logic of redirection, closes #320
additional support for Django CSRF verification.
Make use of FilepickerFile to retrieve Download URL, closes #316
Pull out filepicker JS code #312
Remove SSLRedirect #319
updating nginx for SSL-only operation. closes #319
forgot semicolon
Another way to ensure that we serve static files locally
Set canonical links in note contents #309
All developers are using psql locally now
fix nested inlines
Merge branch 'master' into quizzes

Conflicts:
	karmaworld/settings/dev.py
Quiz import from XML