Merge pull request #283 from MG-RAST/develop

Merging changes from develop to master for hotfix
Merge pull request #299 from jaredbischof/develop

Another fix to documentation links.
CL script to annotate MG-RAST similarity file (blat results) with annotations from API (analysis db)
remove debug message
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge pull request #300 from teharrison/develop

CL script to annotate MG-RAST similarity file (blat results) with annotations from API (analysis db)
api: added option to get hierarchy map with leaf node as key
api: added notebook share request
Merge pull request #301 from teharrison/develop

api feature additions: notebook and m5nr
changes to api parser to handle more attribute and paramater structs
updates to api info output to make more consistant and work with info parser
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
Merge pull request #302 from teharrison/develop

api doc updates
fixed wrong api resource name
added make target to build api docs
Merge pull request #303 from teharrison/develop

added make target to build api docs
fix makefile type
Merge pull request #304 from teharrison/develop

fix makefile type
fix bad api m5nr return structure
Merge pull request #305 from teharrison/develop

fix bad api m5nr return structure