Changes for second competition run
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014
Fixing PID enable in progress
Merge branch 'master' of https://github.com/amccaleb/UCSC-Rover-2014

Conflicts:
	trunk/Software/linux/modules/ImgProc/cascadeDetect.cpp