merge hotfix from MG-RAST/master and extensive development from braithwaite/matR (last approx dozen commits) #36

Closed braithwaite closed 11 years ago