A bunch of checkstyle fixes
Merge branch 'pluggable_chaos_type' into simulate_ebs_failure

Conflicts:
	src/main/java/com/netflix/simianarmy/chaos/ChaosType.java
	src/main/java/com/netflix/simianarmy/chaos/ShutdownInstanceChaosType.java