Refactor query property watching


Query property changes should only trigger reloads when the query hasn't been switched simultaneously
Put column watcher back into total total sums directive
Fix an edge case and simplify total sum updates
Merge pull request #1288 from opf/refactoring/query-property-watching

Refactoring/query property watching