Improved commenting, set defaults
Merge branch 'master' of github.com:isg/rdio