TWC changes

Changes to get tests passing

Related to: https://github.com/greese/dasein-cloud-core/pull/153
and: https://github.com/greese/dasein-cloud-aws/pull/128

Only tested with AWS