Update GeoJSON to use Feature

[Fixes #16]