Move some logic from controller directly into daemon so it can be overridden.
Add direct kill method, but it doesn't tidy up pidfile (yet).
Bumped version.