Fixed bug where resyncing the database caused Gangnam Style, etc, to be re-added to the user database
Merge branch 'master' of ssh://github.com/elliottd/webplayer