Initial commit...after redoing a lot of the code.
Merge branch 'master' of https://github.com/jdstein1/watchtv