Changed interface for types and updated internals
Updates constants.

Fixes scope in query

Need to finish version query
Finished updating search by versions.  Removed query use to be more declarative.
Changed implementation to remove all types and instead use SearchTypes
Merge remote-tracking branch 'ryan/APIBAAS-1362' into merge
External tests working except for old static org/app tests
Committing tests, may be some bugs still
Fixes missing zones.  Just repeats zones for regions that don't have 4 zones.  Done because we ran out of zones with c3.4xlarge with only 2 zones in east.
Fixed read to include compile phase, which is necessary b/c gatling does not execute this phase as a dependency
Changed setup so that the first rest server performs migrations, system setup, then modifies the column families with the performance tweaks.

Fixes setup issue with keyspaces
Changed prefix to match stack name
Updated yourkit
loadtests:infinite user feeder
loadtests: seperating setup from notifications
Merge remote-tracking branch 'origin/two-dot-o' into es-type-updates

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
Finished CP cleanup
Turned down defaults on rest threading
Merge branch 'es-type-updates' into es-type-updates-ryan-external

Conflicts:
	stack/loadtests/README.md
loadtests: fixing entityNameFeeder
Removed unused code and made cassandra resource completely external