Just formatting/indentation changes, nothing important.
Merge origin/PID into PID

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/OI.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotMap.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/ClickTestCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/DriveCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/ResetEncoderCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/DriveSubsystem.java