Ignoring socket connections in newrelic.
Merge branch 'master' of github.com:scrollback/scrollback
Revert "Synthetic scrolling"

This reverts commit f28cbec7604bce63f31e20018b1b68142f9a3968.
Fixed persistent version conflicts