Merge pull request #8 from greese/develop

merge in upstream dasein changes
changes related to upstream merging

Ref TheWeatherCompany/dasein-cloud-aws#62
Ref TheWeatherCompany/dasein-cloud-core#42
fixed one firewall test in error
update snapshot
Merge pull request #10 from greese/develop

Upstream merge
Merge pull request #46 from TheWeatherCompany/develop

TWC changes
ELB clean up