Merge branch 'wtfm' of github.com:JerrySievert/Terraformer into wtfm