Added consistency scenario
Change Database interface
Change default port for CassandraClient
Merge remote-tracking branch 'origin/master'

Conflicts:
	nosql-research/src/main/java/net/thumbtack/research/nosql/Database.java
	nosql-research/src/main/java/net/thumbtack/research/nosql/clients/CassandraClient.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	nosql-research/src/main/java/net/thumbtack/research/nosql/clients/CassandraClient.java
merge