Simplify ec2 interface, get it working all the way through converge