Merge pull request #23 from aranasaurus/master

Super Duper GeoJSON refactor of DOOOOOM!