Set a timeout for parsing SQL query strings into org.intermine.sql.Query objects, configure with os.query.max-query-parse-time.
Remove debug.
Add test for query parsing timeout.
Remove accidental comments.
Merge pull request #646 from rnsmith/optimiser-improvement

Optimiser improvement