Resolve merge conflict with #145

PR #145 adds various options options to Google Cloud Storage. This supersedes that PR, resolving the merge conflict.