shock client lib
Merge branch 'master' of github.com:MG-RAST/AWE into dev-docker
docker integration
fix conflict
fixed conflicts
docker intergration
fixed conflicts
rm path
added comments
Merge pull request #179 from wgerlach/dev-docker

docker integration and some shock related code reorganizing