Switch to supporting the boxcar2 api
Slight syntax tweak
Merge branch 'master' into multiple-tivo-support