fixes for geostore
Merge branch 'master' of github.com:JerrySievert/Terraformer into jerry
Merge branch 'master' of github.com:JerrySievert/Terraformer into jerry
all tests passing