Merge pull request #35 from groupon/dwillson/12

Fix history logging with plugins
Flush response buffer on timeout path