Merge pull request #1 from rohieb/master

PEP-8: wrap to 80 chars
oops, apparently I broke s0nowplaying in the previous commit