Move to Official AWS Gem (DO NOT MERGE)

@ccare - For when we have time for this :)