stopped referring to core instances as "slave" instances, and folded
ec2_slave_instance_type into new core_instance_type option

simply deprecated num_ec2_instances without creating a generic
"num_instances" option, since it's just num_core_instances + 1