simplified god templates dramatically, and starting god with nohup so that it monitors memory usage
no longer having appservers randomly commit suicide
Merge pull request #662 from shatterednirvana/monitor-cpu-memory-in-god

Monitor memory correctly in god
Fixes for queries with more than 1 filter and 1 filter as equal
Merge pull request #668 from jovanchohan/query_tck_fixes

Fixes for queries with more than 1 filter and 1 filter as equal
fixed how we mock out god
Merge pull request #671 from shatterednirvana/fix-broken-god-mocks

fixed how we mock out god
Merge remote-tracking branch 'org/testing' into safely-preserve-persisted-data