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
Adding a quick fix for case sensitivity in the rooms api.
Show check for other case sesitive code.
Merge branch 'staging'
temp branch. quick fixes for the current crashing.
Adding a temp. fix in irc.js
fixed accounts.params parse error, room.old undefined error
A fix for nick event coming before back on irc.
Merge branch 'fix' of github.com:scrollback/scrollback into fix
fixed twitter htmlEncoding Issue, adding htmlencode in package.json