Options passing no longer fails from bad merge

The options merging was incorrect. In addition, the options object was
also incorrectly passed.
Additional watcher error reporting
0.1.2
Unlink the control file if it exists.

Because it's probably from an earlier run.
0.1.3