Merge pull request #1 from schlueter/amazon_ses-cookbook

Conflicts: