Slightly modified robotmain
Merge origin/master
Merge origin/master

Conflicts:
	Robot2014-mule/src/edu/wpi/first/wpilibj/templates/RobotMain.java
Deleted unused classes.
Fine tuned camera code.
Cleaned up drive controls a bit.
Added vertical target detection to camera.