Merge branch 'lighttpd' of git://github.com/bjornfor/nixos into upstream-master

Moves config file into the store rather than polluting etc, which has a
number of benefits

Signed-off-by: Shea Levy <shea@shealevy.com>