fixing content
content tweaks (test)
Merge branch 'master' of https://github.com/raygunc/django.git