improved provisioning for ec2 and misc improvements for virtualbox
fixed merge conflicts