Merge pull request #1 from mlafeldt/optional-mappings

Don't overwrite existing key mappings