Tweak score timing and return position
Merge branch 'master' of https://github.com/FIRST-4030/FTC-2014