Revert "Merge pull request #150 from apigee/USERGRID-348"

Issues exist in the tomcat deployment environment.  Further testing is needed before reverting this revert.

This reverts commit 8efcccbdf04f17220c04fcad7888c87d1b1a326c, reversing
changes made to afe2775ad46f4a8a73e97518f56419105803bff3.

Conflicts:
	core/src/main/java/org/usergrid/persistence/Results.java
	pom.xml
	rest/pom.xml