Removed old version and added brand new implementation
Merge branch 'master' of github.com:isg/rdio