ec2: check ~/.ec2 exists before sourcing
Merge master into mac