Timeouts

One commit to better enable me to manage failed servers in Sydney region (previously I was waiting 15 minutes for salt-cloud to give up).

And another commit to properly raise an error when those server deploys fail.