Conflict fix for cascadeDetect
Fix on linux for PID enable
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014