Sync up with the goamz fixes and API changes for cloudwatch
Merge pull request #614 from levb/fix-cloudwatch

Sync up with the goamz fixes and API changes for cloudwatch