Longer timeout - 30s wasn't long enough
Merge pull request #16 from mikesilky/master

Longer timeout on instance creation - 30s wasn't long enough
merge upstream changes