Don't flush the buffer.
Resolved conflict.
Merge pull request #1 from bobsomers/awesomness

LGTM