Yet another rebase attempt for standardizing AWS parameters

Here's another attempt at standardizing all the AWS parameters, etc.  Github is telling me that this can be automatically merged, so if it needs to be rebased again please provide some details.  Simply saying "Because github is indicating that it will not merge cleanly" is not at all helpful.