Merge pull request googleads#207 from shawnbuso/master

Fixed googleads#206 - typo in test.

Merge pull request googleads#140 from shawnbuso/vjs5

Updating plugin for Video.js 5.3

Merge pull request googleads#70 from shawnbuso/master

Updated for video.js 4.12 and contrib-ads 1.1

Merge pull request googleads#65 from tape-tv/more-settings

pass timeout/prerollTimout settings to contrib.ads