Fix rebase
Merge pull request #170 from mdlayher/nowplaying_user

Make NowPlaying model use an actual User object, instead of just a few fields