Fix Guice for testing
Merge: update Class-renaming to new master

Conflicts:
	src/main/java/ShingleSizeAndThesholdRunner.java
	src/main/java/ThresholdRunner.java