merged Ben's pull request & fixed categories for geomesa/geowave
merged Ben's pull request & fixed categories for geomesa/geowave