refactor to use objects, moar tests
Merge branch 'master' of https://github.com/phsteve/dispatch

Conflicts:
	maps_api.py
	tests.py