Fix potential conflicts with remapped keys
Merge pull request #4 from shanesmith/remapped_key_conflict

Fix potential conflicts with remapped keys