pull in 500 template from tip
Pull in handout latest from tip
whitespace tweaks
remove stray self.test from main ft
Completes rewriting part 10.
Cherry-pick "Part 11 using Django test client" from old branch

Resolved Conflicts:
	mysite/mysite/urls.py
	mysite/polls/tests.py
	mysite/polls/views.py
	pycon_2013_handout.asciidoc
ft for part 12
Add unit tests and implementation of voting form to poll template
finishes up part 12
Pull in handout from main branch
Move old tutorial into a subfolder
Merge branch 'pycon_2013' into pycon_2013_rewriting, taking rewrite as authoritative