Removed redundant scheduler
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o
Fixes chop version
Merge branch 'two-dot-o' into rxfixes

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
	stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java