Changed way of getting amazon config
Merge branch 'master' of https://github.com/rabix/registry