Upgrade file format to line-oriented todos

Includes secret upgrade option from the CLI:

 --upgrade

which will read using the old format and rewrite in the new format.
Merge branch 'master' into fileformat

Fix up several conflicts.
Increment to v1.0 for new file format

Not ready for release yet but is basically not
compatible with the old format.