Allow specifying the API key rather than creepy ENV state
Merge remote-tracking branch 'eleos/master'