Spout wrapping
Fixup type
Merge pull request #289 from twitter/feature/wrap_up_spouts

Spout wrapping