Use correct version for exceptions
Correct exception names, s/amazon/amazonaws/
Merge remote-tracking branch 'chrisavl/exception_versions'