merging api keys; fixes #93
merge
Merge pull request #95 from thelac/dsuo/merge-api-keys

merging api keys; fixes #93