Run 2to3 on Django examples, begin to update code
Clean up test.__init__
Add Django dependency to Travis configuration
Merge branch 'master' into update-djopenid-examples
Update Django examples just enough that tests pass