More progress on tests, 90% now passing.
Changes to allow CpEntityManager to work with new IndexScope stuff.
Merge branch 'index-scope-updates' of https://github.com/usergrid/usergrid into index-scope-updates

Conflicts:
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/CandidateResult.java
Fix Guice injection errors.
Merge branch 'index-scope-updates' into two-dot-o
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into USERGRID-140_partial_updates

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fix Guice injection errors.
  Changes to allow CpEntityManager to work with new IndexScope stuff.
  More progress on tests, 90% now passing.