Options for log_file and pid_file
Merge branch 'master' of github.com:JScott/minimal-ci