Style fixes
Merge branch 'master' of github.com:lopatin/rdio-puppies
Style changes moar