Reduced autonomous wait time to 0.5 seconds
Merged conflicting commits caused by Dropbox.
Merge branch 'autonomous-fix' into testing
Bring branch 'better-drive' up to date with master