added a git pull
docker_image_version templating
docker and nodocker
fix conflict
Merge pull request #363 from teharrison/master

fix dereplication always running
Merge branch 'master' of github.com:MG-RAST/pipeline
integrated optional use of dockerimages
mgrast-docker.awe.template has been replaced with options in mgrast-prod.awe.template
added libberkeleydb-perl
make pipeline and type variables. --production is now required for production
Merge pull request #364 from wgerlach/master

make docker an option in the production template
moved awe_loaddb to the end of the document, easier to omit for testing puposes
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