Errors when boto_bucket isn't defined
Merge branch 'master' into fix/boto-bucket

Conflicts:
	metadata.rb
Merge pull request #1 from tarnfeld/fix/boto-bucket

Errors when boto_bucket isn't defined