Merge pull request #238 from dhermes/large-style-changes

Large number of style-related changes to pass pylint
Refactoring duplicate code between storage.key and storage.bucket.