adding geocoder module and geopy requirement
Merge remote-tracking branch 'upstream/master'

Conflicts:
	requirements.txt
fixing revision number of migration script
Merge remote-tracking branch 'upstream/master'
Merge pull request #57 from radioprotector/master

Add Geocoder class, geopy requirement, and add additional address fields to resources