Minor formating.
Merge branch 'two-dot-o' into optimistic-tx-semantics
First stab at optimistic verification
Merge branch 'two-dot-o' into optimistic-tx-semantics
Progress on optimistic verify and test.
Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
shell of a WriteOptimisticVerifyTest now in place, but it does not really test anything.
Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
Separate WriteOptimisticVerify test into to parts, one Theories part and one Jukito part.
Use mocks instead of real live serialization strategy.
Merge branch 'two-dot-o' into optimistic-tx-semantics

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
	stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestCollectionModule.java
Fix broken test.
Operation specific exception types.
We now cleanup and unique values on version conflict; also, added better tests for optimistic and unique verification.
Operation now removes self from log instead of writing a rollback entry.
New RollbackAction and exception handling changes.
Added file to be the impl for the queue.
Added amazon lib with no deployment errors ( it WILL break when merged into the rest tier though)
Added list of things that need to be done for the queue method.
Updated the property configurations so that network strategy and simple strategies are interchangeable
Updated tests as well as props for AWS
Merge branch 'two-dot-o' into asyncqueue