support upstreams in nginx.conf
syntax error
now with even fewer syntax errors
Merge branch 'feature/upstreams' into tcg-master
Merge pull request #23 from the-control-group/master

set 'daemon on;' by default
Merge pull request #24 from the-control-group/feature/misc-config-items

Feature/misc config items
Merge branch 'master' into tcg-master