Actually use passed in aws creds.

Also did some small cleanups and renames. Probably could've split the commits up, but whatever.