Update GeoJSON to use Feature

[Fixes #16]
Merge pull request #17 from peepoltv/fix-geojson

Update GeoJSON to use Feature
Merge branch 'master' into nuve-test

* master:
  Update GeoJSON to use Feature