updated (replaced from busted merge)
Merge branch 'master' of https://github.com/NCIP/taverna-grid

Conflicts:
	README.md
updated/replaced