Retries for incremental state.
Merge branch 'master' of github.com:boneill42/storm-cassandra-cql

Conflicts:
	src/main/java/com/hmsonline/trident/cql/incremental/CassandraCqlIncrementalState.java
	src/test/java/com/hmsonline/trident/cql/ConditionalUpdateTest.java