Merge branch 'master' of github.com:JerrySievert/Terraformer
Merge branch 'master' of github.com:JerrySievert/Terraformer
more code coverage, remove more dead code