Merge all Facebook Scribe changes

* Updates to the latest code changes from [facebook/scribe](https://github.com/facebook/scribe)