Revert "Merge pull request #4 from tonuquq/two-dot-o"

This reverts commit 970b16bbd91ef969416ea390d4dd1478cc39d22c, reversing
changes made to a9861e2016ac46a214c16e0180b343f1a94c2449.

Conflicts:
	stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/MigrationManagerRule.java
	stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestCollectionModule.java
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o