EC2 Wait fix

Hi,

I'd like to introduce a wait timeout for instances. To make this work reliably, I had to deal with a race condition between creating and fetching instance object, too.

Thanks!