added timeout fix and tests.
Merge branch 'hotfix/error-timeout-squashed' of github.com:mmcc/video.js into mmcc-hotfix/error-timeout-squashed
Added a line to the changelog for #1473