Post-Champs

Added joystick buttons for popping ball back to human player and for
adding extra slack to the winch. Roller bar runs a little longer in
two-ball auto.
Merge branch 'master' of https://github.com/frc-2175/JavaRobot2014

Conflicts:
	2014SmartDashboard.xml
	nbproject/private/private.xml
	src/org/usfirst/frc2175/Robot2014/OI.java
	src/org/usfirst/frc2175/Robot2014/commands/Auton3DoubleBlindShot.java
Conflicts are stupid