Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
added new options
fixed bug with bad alpha-diversity number
updated matrix info
updated abundanceprofile info
this is depricated, async added to matrix.pm
Merge pull request #247 from teharrison/develop

minor fixes