Move some parameters from command line to properties. Added consistency_b scenario
Merge remote-tracking branch 'origin/master'

Conflicts:
	nosql-research/src/main/java/net/thumbtack/research/nosql/Researcher.java
	nosql-research/src/main/java/net/thumbtack/research/nosql/scenarios/Scenario.java
merge