Fixed tpb.js from its odd duplication thing
Merge branch 'master' of https://github.com/k3d3/popcorn-app