Merge pull request #136 from drivecore/feature/api-keys-in-config

Merge pull request #136 from drivecore/feature/api-keys-in-config #294