Fixed a couple derps and added some in
Merge branch 'master' of https://github.com/Robotic-Brain/WaterCraft