Nightmare governor: removed sampling_up_factor parm.
Removed Touch Freq on/off, deleted in kernel.
Merge remote-tracking branch 'dorimanx/master'