Fixes for upstream pull request.

Fixes #1, #4, and #7 discussed in
https://github.com/greese/dasein-cloud-aws/pull/128.
Merge branch 'develop' of github.com:TheWeatherCompany/dasein-cloud-aws into develop