Re-establish Ruby 1.8.7 compatibiilty. One minor RSpec deprecation fix.
Merge branch 'master' of github.com:healthpost/aws-sdk-ruby

Getting latest changes from remote.
Merge pull request #678 from healthpost/master

Re-establish Ruby 1.8.7 compatibility