various bug fixes
Merge branch 'aerialassist' of github.com:FRC2539/command-based into aerialassist

Conflicts:
	Subsystems/DriveTrain.cpp
	Subsystems/PickUp.h