Clean up configuration a bit and move from /var/run to /var/lib by default

Change-Id: I35ba1ddad7130bb498f4a4ca9542d11f000fc810
Signed-off-by: Rob Adams <readams@readams.net>