Move top-level vars inside ViewModel, add semicolons, format anonymous functions consistently, simplify Video ctor.
Merge branch 'master' of ../tpdextras into videoClient