fix operators
expand the diff option so we can pass values to it
Fix conflict.
Merge branch 'master' into diffs
Merge branch 'master' into diffs
Merge branch 'master' into diffs
Merge branch 'master' into diffs
Move away from explicitly declaring the diff whenever we need it
Tidy up some of the option-handling
Fixes
Fixed errors in the tests