Changed session cookie name to sbsid
Merge branch 'staging' of github.com:scrollback/scrollback into staging
Merge branch 'staging' of github.com:scrollback/scrollback into staging

Conflicts:
	http/socket.js
Merged admin-notifier log file change (minor)
Fixed /dlg/cookie on the request that sets it.
Synthetic scrolling
Merge branch 'staging' of github.com:scrollback/scrollback into staging
Fixed a few minor bugs.
Ignoring socket connections in newrelic.
Merge branch 'master' of github.com:scrollback/scrollback
Revert "Synthetic scrolling"

This reverts commit f28cbec7604bce63f31e20018b1b68142f9a3968.
Fixed persistent version conflicts
Revert "Revert "Synthetic scrolling"", bringing it back in this branch

This reverts commit 38698ee2a66ee328c574e6d161b5a62e6a68c4d4.
Improvements to low-level scrolling
Scrolling changes
Finished scrolling fixes
Merge branch 'scrolling' into fix

Conflicts:
	http/socket.js
	public/style.css
	validator/messagevalidation/messagevalidation.js