merging in prior branch

Merge branch 'emax-unstable' of github.com:sociam/indx into emax-unstable
updating branch

Merge branch 'unstable' into emax-unstable
modifying blaster for MIT trip
modifying blaster for MIT trip
Initial modifications to async protocol
Merge branch 'diffquery' of github.com:sociam/indx into diffquery
Clean up subscribers
Diff listeners moved to a new class
Requests modify the diff listener
channel stuff
merging in updates from emax-unstable

Merge branch 'emax-unstable' into diffquery2
new diffs from dan

Merge branch 'diffquery' of github.com:sociam/indx into diffquery
channel update
Update sending query from subscriber to box
Diff now implements new protocol
Fix bugs in diff start implementation
Diff fix
Fix bug with setquery checking and add some initial websockets tests
massive refactoring out indxjs websocket code and improvements regarding error handling
merging in new diffquery changes

Merge branch 'diffquery' into diffquery3