I committed the previous code with some errors in it!  Not good.  I fixe...

...d these in this patch.

I also removed some unused variables (like the gyro), which we haven't yet heard will be on the robot.