Add enable_ec2 option, set to false by default, with 60s timeout for querying EC2 API, closes #3