Rename the list of chaosTypes field.

Now that we can enable/disable chaos types, the field name was misleading.
Merge branch 'pluggable_chaos_type' into block_network_chaos_type

Conflicts:
	src/main/java/com/netflix/simianarmy/basic/chaos/BasicChaosMonkey.java