Add ability to run start.py as an Unix daemon (requires
python-daemonize)
Add ability to run api.py as a Unix daemon
resolve merge conflicts