LulzactiveW: Some optimizations and bump to v2

Minor changes to up_sample_time and inc_cpu_load so the CPU will always scale up to the max when needed
Some Git merge fixes

How did I miss this?