test changes, formatting cleanups, removed video file
Merge branch 'integration' into joystick-cleanup