Add production env testing
Merge branch 'master' of http://github.com/adamjshook/nimbus

Conflicts:
	NimbusBenchmark/src/main/java/nimbus/benchmark/NimbusSetBenchmarker.java
Commit changes from AWS