Revised Combos and Autonomous

differentiated between teleop and auton functions, updated structure to
combo code to match what we are going to do in autonomous