Import lots of shit
Get authentication working against Rdio
Merge remote-tracking branch 'origin/master'