Add -x/--reset option.

[xaviershay]

I had a quick go at fixing master but it wasn't trivial.

This is branched of the v0.1.0 tag, and adds the --reset option, which I needed to make this useable for my workflow.

May not want to merge or whatever coz it isn't tested, but putting it up here so it's useful for others.