Added Makefile shortcuts to enable/disable captive portal
nginx.conf now copied from base settings file in repo and nginx.conf is ignored to allow users to freely change the nginx settings without fear of commiting
Captive portal is disabled by default
Removed unnessisary rewrite rule