implements re-map setting for changing one keypress to another
Merge branch 'remap'