Update master

Reflect changes for Nemesis's great work on daemonizing/port/databaselocation/pidfile code.