Adding tagging
Merge pull request #1584 from edx/e0d/fix-ami-build

Adding tagging