Make AWS machines convergent
Merge pull request #18 from opscode/convergent

Make AWS machines convergent