Merge branch 'streams' of github.com:JerrySievert/Terraformer into streams
working streams!