documentation hint about django-nose and south, r=ErikRose
upgrade playdoh-lib for latest django-session-csrf, r=Osmose
Merge remote-tracking branch 'playdoh/master' into merge-latest-playdoh

Conflicts:
	project/settings/base.py