Flatten strings (squash merged)

Squash merge of the branch from #332 to follow a master-centric commit log convention. I don't think it would have been possible to undo the commits I pushed upstream already on the original branch.

https://github.com/isaacs/github/issues/18