Merge branch 'develop'
Removes api keys from default config