Actually fixed autonomous.
Merge origin/master

Conflicts:
	Robot2014-mule/src/edu/wpi/first/wpilibj/templates/Autonomous.java
Merge origin/master

Conflicts:
	Robot2014-mule/src/edu/wpi/first/wpilibj/templates/Autonomous.java
Merge origin/master