Refactor some shooter and feeder code
Merge branch 'master' of https://github.com/team467/Team467-FRC-Robot-Code

Conflicts:
	Robot2014-nonaem/src/edu/wpi/first/wpilibj/templates/Launcher.java