consolidate changes from chef
Merge pull request #22 from optimizely/consolidate-cloudwatch

consolidate changes from chef