Minor Changes

Changed encoder channels to fit robot and made minor changes to
ResetCatapult.