Merge pull request #525 from MG-RAST/develop

Various updates - see commit list.