add global parameter for timeout
updated to aws-scala-tools 0.6.2
Merge branch 'master' of github.com:ohnosequences/metapasta