Fixes test setup.  Tests still broken
Merge branch 'es-type-updates-ryan-external' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into es-type-updates-ryan-external
Fixed GeoIT.

Cleaned up Query class

Harded search methods.  Input validation was not done to ensure we have minimum data to execute queries.
Cleaned up obscelete external resources