diff --git a/README.md b/README.md
index 78d446d..7fa4beb 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ From the bottom up:
 - [ ] Sample Go app
 - [ ] Support Go deployments
 - [ ] CLI command documentation
-- [ ] nginx support
+- [x] nginx support - creates an nginx config file if `SERVER_NAME` is defined
 - [x] Testing with pre-packaged [uWSGI][uwsgi] versions on Debian Jessie (yes, it was painful)
 - [x] Support barebones binary deployments
 - [x] Complete installation instructions (see `INSTALL.md`, which also has a draft of Go installation steps)
diff --git a/nginx.default.dist b/nginx.default.dist
index aeadd08..fc5e76d 100644
--- a/nginx.default.dist
+++ b/nginx.default.dist
@@ -24,5 +24,5 @@ server {
 		# as directory, then fall back to displaying a 404.
 		try_files $uri $uri/ =404;
 	}
-	include /home/piku/.piku/nginx/*.conf;
 }
+include /home/piku/.piku/nginx/*.conf;
diff --git a/piku.py b/piku.py
index 6de8ced..eb558ff 100644
--- a/piku.py
+++ b/piku.py
@@ -172,7 +172,7 @@ def do_deploy(app, deltas={}):
             if exists(join(app_path, 'requirements.txt')):
                 echo("-----> Python app detected.", fg='green')
                 deploy_python(app, deltas)
-            if exists(join(app_path, 'Godeps')) or len(glob(join(app_path,'*.go'))):
+            elif exists(join(app_path, 'Godeps')) or len(glob(join(app_path,'*.go'))):
                 echo("-----> Go app detected.", fg='green')
                 deploy_go(app, deltas)
             else: