measure docker preparation time
Merge branch 'master' of github.com:MG-RAST/AWE
debug output pstats.DockerPrep
copt dockerPrep time
copy mem perf
Merge branch 'master' of github.com:MG-RAST/AWE
added resource type list
add shockhost to task resource
api_url arg added for Retina
added ext_api_url, ext_site_url, site_port and api_port
fix default for api_url
Merge branch 'master' of github.com:MG-RAST/AWE
Merge branch 'master' of github.com:MG-RAST/AWE
restructured confi and comman line parsing
show args
fix -conf parameter
expand variables in config file
debug info
debug info
remove has.options