Avoid config key clashes

Fixes #48
Merge pull request #49 from johtso/issue-48

Avoid config key clashes