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.