Allow specification of a Google API key.
Resolved conflicts
Merge David's API key changes

- support both API key storage mechanisms for the interim
Resolve merge conflicts with David