Reorganized N64 controller prefs
Merge remote-tracking branch 'upstream/master'