Rebased branch of AWS cleanup commits

I've added the missing alias documentation for aws_access_key that @lwade spotted and merged all the other AWS cleanup commits into this new pull request.