incorporate stuff from aws-scala-tools

under ohnosequences/aws-scala-tools there's stuff that needs to be incorporated here, and removed from there.