Upgrade to be compatible with Boto 2.8.0
Merge branch 'master' of github.com:bbeck/cloud-tools