Tidy up header.

- Separate paths from imports by two blank lines
- Sort imports
Revert "Remove ip argument to location_from_ip."

This is required for testing.

This reverts commit 8e78af316b4ea1ffc6f4bc128d7a1f30be0a786f.

Conflicts:
	tzupdate
Fix setup.py version