Merge pull request #292 from teharrison/develop

api updates, annotation resource
added asynchronous option to annotation api
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop