Merge MappingManager methods into Remapper
Keyboard and Joystick option saving implemented