handle users w/o spotify premium more gracefully
Merge remote-tracking branch 'origin/master'