Add rdio/spotify hybrid. Committing to make massive cleanup changes
Nuking the old Spotify app and did massive re-arranging. Upgraded and simplified raphael/colorwheel