fixed hierarchy subselection
Analysis.pm: fixed bug in delete_job
Merge pull request #212 from teharrison/develop

bug fixes in analysis.pm
Merge pull request #215 from MG-RAST/master

hotfix back to develop
info text update
m5nr api: added more options to retrieve taxonomy/ontology slices
Merge pull request #216 from teharrison/develop

api additions for taxonomy / ontology retrieval
changed m5nr resource call for returning children of parent from hierarchy
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Merge pull request #217 from teharrison/develop

changed m5nr resource call for returning children of parent from hierarc...
Merge branch 'master' of github.com:MG-RAST/MG-RAST into develop
added metagenome name to 'columns' attribute of matrix resource
Merge pull request #218 from teharrison/develop

added metagenome name to 'columns' attribute of matrix resource
Moved "unpack" operations on upload page to be an operation that is performed on cluster nodes so that users can spawn many "unpack" operations and not be concerned with the operations dying from overwhelming the web hosting machine.  Also, allowing users to delete files that are undergoing an operation if and only if that operation is "uploading".  This allows users to delete files from incomplete uploads.
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Merge pull request #220 from jaredbischof/develop

More edits to upload.cgi
catched error when returning empty matrix data
Merge pull request #221 from teharrison/develop

catched error when returning empty matrix data
fix error in retrun type
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop