Allow specification of a Google API key.
Resolved conflicts