Simplification of changes introduced in 19c7c6d95e8a3618d8e779f4c2c9fec6cbe5348a to avoid modifying config vars
Merge pull request #23 from chrisjs/custom_ami_simplifications

Simplification of changes introduced in 19c7c6d95e8a3618d8e779f4c2c9fec6cbe5348a to avoid modifying config vars