Merge remote-tracking branch 'dist/master' into z-height
Parameter tweak for running on less-capable machines.

Relaxed the timeout before going into
"arm protection mode."
Made the debug visualization a bit easier to use.
Fixed some minor bugs in the kinect driver.
Fixed some changes to because of changes to april.
Fixed simulation conflict between controller and armsim.
Merge remote-tracking branch 'rgoeddel/master'