a bit more documentation for --config
tiny PEP8 fixes
Merge branch 'master' of github.com:sampsyo/beets