A bunch of checkstyle fixes
Checkstyle fixes

Also revert the vsphere check; just log/ignore any error
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
Better Javadoc on ShutdownInstanceChaosType
Merge branch 'pluggable_chaos_type' into simulate_ebs_failure

Conflicts:
	src/main/java/com/netflix/simianarmy/chaos/ShutdownInstanceChaosType.java
More checkstyle fixes
Working around findbugs / checkstyle issues
Tolerate AmazonClientException, not just AmazonServiceException

Because of the mockery of the unit tests again :-)
Merge branch 'pluggable_chaos_type' into simulate_ebs_failure

Conflicts:
	src/main/java/com/netflix/simianarmy/chaos/ChaosType.java
Add DetachVolumes to strategy list
Fix Checkstyle issue
Merge branch 'auto_create_simpledb_domain'
Merge branch 'simulate_ebs_failure'