Correctly switching between polling/websockets
Merge remote branch 'KiwiIRC/development' into simosnap