Merge pull request #368 from MG-RAST/develop

develop stuff to api
Merge branch 'api' of https://github.com/MG-RAST/MG-RAST into develop
Don't need to build api-doc target every time we run make.
Edited Makefile to compile metazen code in parent directory if present
Edited Makefile to compile metazen code
Merge pull request #442 from jaredbischof/develop

Merge and updates to Makefile.
API: moved CV list to parent class
API: added hierarchal filtering to sequence download
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
API: fix bug, better error checking
Merge pull request #443 from teharrison/develop

API: added hierarchal filtering to sequence download, some internal fixing
API: metagenome metadata option also outputs mixs data
Merge pull request #444 from teharrison/develop

API: metagenome metadata option also outputs mixs data
Merge branch 'develop' of github.com:MG-RAST/MG-RAST