multiple fixes, and added the climber assist again
Merge branch 'master' of https://github.com/amesrobotics/2013robot.git/