closes #363
Merge branch 'intermine-1.2.1' of github.com:intermine/intermine into intermine-1.2.1
closes #356
closes #357
Refactored the bag status queries, and added a general method.
Don't upgrade if already upgrading
Whoops - forgot a bang
Don't wait for upgrades in webservice requests. It is stupid
added config to merge web-model.xml and web.xml #313 #309
Merge branch 'intermine-1.2.1' of github.com:intermine/intermine into intermine-1.2.1
priorities updated to accept entrez-organism source
Merge remote branch 'upstream/intermine-1.2.1' into jw
Followed Fengyuan's recommendations to enable FASTA loader.

https://github.com/WormBase/website/issues/847

```
Please add the following two bits to the appropriate locations in your MINE/webapp/build.xml:

https://github.com/intermine/intermine/blob/dev/bio/skeletons/mine/webapp/build.xml#L18
https://github.com/intermine/intermine/blob/dev/bio/skeletons/mine/webapp/build.xml#L47-L52
```