more changes to things of stuff
Merge remote-tracking branch 'annex/f_geomesa_tools' into f_geomesa_tools
fixed up ingest command to now take format as a subcommand, geojson sortof in, csv sortof working
merge fixed conflicts