Merge pull request #32 from lramsey/integrating

Integrating
change resume code in player.js and bgPlayer
Merge branch 'master' of https://github.com/klickr/klickr-chrome into integrating