Fixed joystick defines
Merge branch 'master' of https://github.com/purduerov/BattleStation