Second pass at moving joystick settings into general settings dialog window

Hopefully this one's a little cleaner. Only thing I could see people complaining about is me changing "joystick" to "controller" in the UI, but I think that makes more sense. I use this interface and only use gamepads, not joysticks, so controllers should be a more general and better term anyways.