Fixed rebinding joystick button bug

Dirty hack - some kind of problem with the way hotkey On / Off works in
AHK.
Rudimentary Joystick button support in bindings

A bit of a code tidy up too