Control Binding Fixes and Achievement Fixes

- When resetting bindings on the keyboard it would remove mappings for controllers making them unsuable this is now fixed
- Keyboard bindings would sometimes show controller mapping bindings
- Fixed a couple of achievements as they were being achieved under incorrect circumstances