some code clean up
Merge branch 'pluginUI' of http://github.com/scrollback/scrollback into pluginUI

Conflicts:
	plugins/http/socket.js