Improved constraints. There was no good reason to limit them to simple fields.
Dryer code
removes removed exception
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 #589 from alexkalderimis/data-service-improvements

Some simple improvements to the simple data service
Merge pull request #644 from intermine/toremoveoldpubmedgene

removes removed exception
Merge pull request #646 from rnsmith/optimiser-improvement

Optimiser improvement
Merge beta into branch