Avoid FindBugs warnings

We had a circular initialization loop (at least in theory)
Merge branch 'pluggable_chaos_type' into simulate_ebs_failure

Conflicts:
	src/main/java/com/netflix/simianarmy/basic/chaos/BasicChaosMonkey.java
Merge branch 'simulate_ebs_failure'