Make -h option equivalent to help command

Fixes #867.
Correctly reset import progress.

Progress is a `defaultdict` and we assume presence of any key. This
means we have to assign keys the default value instead of deleting
them. Fixes #873.
PEP8 Fixes
Use ordinary dict for progress (#873)

This is compatible with older versions of beets. It should also be less
surprising when deserializing.
Sort help output

Commands are now listed in sorted order. (With Python's hash randomization,
the order was changing on every execution!)
Update genres-tree.yaml

funkd is clearly a typo
Merge pull request #881 from nrgetik/patch-1

Update genres-tree.yaml
Don't write state to disk when nothing changes
Add 'auto' option in acoustid(Fix #629)
Merge pull request #888 from lacasse/master

Add 'auto' option in acoustid(Fix #629)
Fixes for chroma.auto (#888, fix #629)