Added a template with an optional constraint.

This is a startling ommision from our set of test templates.
Make a distinction between trimmed and full versions of queries. Fixes intermine/intermine#584
Merge remote-tracking branch 'alex/i584' into beta
Added travis config files.
travis-lint and travis docs disagree about addons
No need for hyphens. KISS.
Foolishly used wrong ant option
Bio test properties need to be in a different file.
Just test uniprot for now.
Slightly more generic ci conf.
Record failures and actually fail the build.
Also add testmodel properties.
Added a critical environment variable.
Merge pull request #613 from alexkalderimis/zombie-butler

Bringing the butler back to life