fixes to code after changes to get it working on frisbeebot
Merge branch 'NewFrisbeeTest' of https://github.com/The-Charge/2014_BigBallBot into NewFrisbeeTest