More small changes.
Fixing last commit
Merge branch 'master' of https://github.com/FRC3161/Iapetus2014 into competition

Conflicts:
	src/ca/team3161/iapetus/Iapetus.java