Implemented graceful wait on resource deployment to avoid race conditions
Delete is now fault tolerant (in case the container has been killed manually using docker cli)
Merge branch 'master' of github.com:dotcloud/openstack-heat-docker