diff --git a/_src/_includes/head.html b/_src/_includes/head.html
index dd287ba..6ea598b 100644
--- a/_src/_includes/head.html
+++ b/_src/_includes/head.html
@@ -57,9 +57,9 @@
     <!-- Twitter Cards -->
     {% include twittercards.html %}
 
-    <!-- Prevent search indexing for some pages -->
-    {% if page.sitemap == false %}
-    <meta name="robots" content="noindex">
+    <!-- Prevent search indexing for some pages or non-production builds -->
+    {% if jekyll.environment != 'production' or page.sitemap == false  %}
+    <meta name="robots" content="noindex, nofollow">
     {% endif %}
 
 </head>
diff --git a/gulpfile.js b/gulpfile.js
index e0c789e..a859d82 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -115,6 +115,7 @@ gulp.task('jekyll', function(cb) {
         process.env.JEKYLL_ENV = 'production';
         var jekyll = spawn('bundle', ['exec', 'jekyll', 'build'], { stdio: 'inherit' });
     } else {
+        process.env.JEKYLL_ENV = 'development';
         var jekyll = spawn('bundle', ['exec', 'jekyll', 'build', '--incremental', '--drafts', '--future'], { stdio: 'inherit' });
     }