Tighten up code a little bit
Rename 'handler' to 'lookup' to be more semantically precise
Make some changes to be compliant with the GeoJSON spec