Compressor stuff, trigger.
Merge origin/master

Conflicts:
	src/org/usfirst/frc2538/AerialAssist2014/commands/FirePlaidapult.java