Bugfix/joystick

Fixes #660. Still has to be tested by @mantognini on OS X, and possibly others that have access to a joystick :smile:.