/cc @jmassara - I pulled out the AMI stuff into a common config struct and also added in the new template stuff (that didn't exist when you made the pull, so not your fault! :))
Mitchell Hashimoto