get rid of dwr, will use websocket instead
Merge branch 'nodwr'