small changes
merging latest patch

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3
merging in dan's critical fix

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3
updated difftest
dan fixed slowness mergin in

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3