Fix long strings being split up wrongly in diffs
options
Merge branch 'master-emax' of github.com:sociam/indx into emax-watcher
Remove server side ORDERing, use view ordering
Merge branch 'master-emax' of github.com:sociam/indx into emax-watcher