First batch with fixes
Merge branch 'master' of github.com:plexinc-plugins/TED-Talks.bundle