Merge pull request #365 from wgerlach/master

moved awe_loaddb to the end of the document, easier to omit for testing
updates to properly switch pipeline to use BerkleyDB in annotation stage
Merge branch 'master' of github.com:MG-RAST/pipeline
fix to task numbering
Merge pull request #366 from teharrison/master

updates to properly switch pipeline to use BerkleyDB in annotation stage
better test