Merge pull request #300 from teharrison/develop

CL script to annotate MG-RAST similarity file (blat results) with annotations from API (analysis db)
Merge pull request #301 from teharrison/develop

api feature additions: notebook and m5nr
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
fixed wrong api resource name
added make target to build api docs