Merge pull request #324 from paczian/master

security patch for oAuthPPO.cgi
api: add taxid to matrix output
api: added taxid output option to matrix, fixed taxonomy list in single mode
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge pull request #325 from teharrison/develop

api: add taxid to matrix output