Nightmare governor: removed some options and optimized code!
Merge remote-tracking branch 'dorimanx/master-jelly-cm-aokp' into master-3.0.y