Allow watch folders to be disabled
Allow detailed <watch> configuration in daemon.xml; see #105
Add more daemon options; remove cleanup from upoptions
PID file
Merge develop