reformat for line length limits
change non_keyboard_options' default value to None

Using False meant that the c.R.BOOLEAN_STATES[raa_setting] call failed
because `False` is not a string. None allows differentiate between an
unset and a Falsy value
Merge branch 'master' of github.com:mineo/mplayer-autocmd