Made accelerometer local in Velocity, added calibration.
Combined calibration methods and added wait time.
Added ring buffer to Velocity.
Added debugging stuff.
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:
	2014-AerialAssist/AerialAssist/src/org/discobots/aerialassist/subsystems/Drivetrain.java