Changes as of Wednesday 11 September
Merge branch 'master' of https://github.com/leifos/tango_with_django

Merging with David's changes