Merge pull request #5 from awslabs/develop

Fix: Issue with placement condition in template.
Merge pull request #6 from awslabs/develop

Fix: updating ami's in template
Merge pull request #7 from awslabs/master

Syncing master and develop