An attempt to rework the Amazon AMI tools, so they aren't a mess.