Friday Winsor - Robot works, watch the air

and drive
Merge branch 'chassis' of https://github.com/DevilTech/Robotics2014 into chassis

Conflicts:
	nbproject/project.bak.xml
	nbproject/project.xml
	src/edu/wpi/first/wpilibj/templates/Gatherer.java
	src/edu/wpi/first/wpilibj/templates/RobotTemplate.java
	src/edu/wpi/first/wpilibj/templates/Shooter.java