Bump to the latest version of pytz
Removed gondor dependency, it is no longer used for deployment
Revert changes to main URL file

There are some URL patterns that share a name, so order matters a lot.
Merge pull request #311 from PyCon/talk-bug

Revert changes to main URL file
Merge pull request #310 from alex/patch-3

Removed gondor dependency, it is no longer used for deployment
Merge pull request #309 from alex/patch-2

Bump to the latest version of pytz
Merge branch 'develop' into patch-1

Conflicts:
	requirements/project.txt