Typos
Merge branch 'master' of github.com:jonhoo/django-zoobar

Conflicts:
	doc/proj-final.tex