Stops in auton
Lengthens Auton time
Merge remote-tracking branch 'new/master-states' into master-states