Merge branch 'kyle'
Fix for bad API key.
Merge branch 'master' into kyle