merging in prior branch

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

Merge branch 'unstable' into emax-unstable
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
massive refactoring out indxjs websocket code and improvements regarding error handling
merging in new diffquery changes

Merge branch 'diffquery' into diffquery3
merging in latest patches from dans changes to diff semantics

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3
made changes so diffs now seem to work
diff test
Merge remote-tracking branch 'origin/diffquery3' into diffquery
Change websocket test to work with new indx.js