Remove stray logging
Add additional geolocation types

Also refactor to make it easier to change and order these in the future.

Fixes #657
Merge pull request #683 from ahinz/fix/657/refactor-geocoder-a-bit

Fix/657/refactor geocoder a bit