diff --git a/content/2010/io/balance.go b/content/2010/io/balance.go
index 4ecac02f..8388cfd4 100644
--- a/content/2010/io/balance.go
+++ b/content/2010/io/balance.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2010/io/decrypt.go b/content/2010/io/decrypt.go
index 4173fb6e..5c30fe2c 100644
--- a/content/2010/io/decrypt.go
+++ b/content/2010/io/decrypt.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build OMIT
+// +build ignore,OMIT
 
 // This code differs from the slides in that it handles errors.
 
diff --git a/content/2010/io/encrypt.go b/content/2010/io/encrypt.go
index f2229d9e..c942fe57 100644
--- a/content/2010/io/encrypt.go
+++ b/content/2010/io/encrypt.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build OMIT
+// +build ignore,OMIT
 
 // This code differs from the slides in that it handles errors.
 
diff --git a/content/2010/io/eval1.go b/content/2010/io/eval1.go
index c5f62373..eef7741e 100644
--- a/content/2010/io/eval1.go
+++ b/content/2010/io/eval1.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2010/io/eval2.go b/content/2010/io/eval2.go
index e80aff03..d138a51f 100644
--- a/content/2010/io/eval2.go
+++ b/content/2010/io/eval2.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/10things/10.go b/content/2012/10things/10.go
index 7940a82c..986cb872 100644
--- a/content/2012/10things/10.go
+++ b/content/2012/10things/10.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/10things/8.go b/content/2012/10things/8.go
index 6baca789..9be9a4d4 100644
--- a/content/2012/10things/8.go
+++ b/content/2012/10things/8.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/10things/9.go b/content/2012/10things/9.go
index 61daba03..ce6791f9 100644
--- a/content/2012/10things/9.go
+++ b/content/2012/10things/9.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/10things/9b.go b/content/2012/10things/9b.go
index 98a43b2b..577b0162 100644
--- a/content/2012/10things/9b.go
+++ b/content/2012/10things/9b.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/both/chat.go b/content/2012/chat/both/chat.go
index b7f21850..d712b913 100644
--- a/content/2012/chat/both/chat.go
+++ b/content/2012/chat/both/chat.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/both/html.go b/content/2012/chat/both/html.go
index 6972c2c5..090e80da 100644
--- a/content/2012/chat/both/html.go
+++ b/content/2012/chat/both/html.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/both/markov.go b/content/2012/chat/both/markov.go
index 105a4e2e..97dfe413 100644
--- a/content/2012/chat/both/markov.go
+++ b/content/2012/chat/both/markov.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/http-noembed/chat.go b/content/2012/chat/http-noembed/chat.go
index 1306652e..095934a9 100644
--- a/content/2012/chat/http-noembed/chat.go
+++ b/content/2012/chat/http-noembed/chat.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/http-noembed/html.go b/content/2012/chat/http-noembed/html.go
index d4f7f359..b4e1fdc4 100644
--- a/content/2012/chat/http-noembed/html.go
+++ b/content/2012/chat/http-noembed/html.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/http/chat.go b/content/2012/chat/http/chat.go
index ae37e12e..031a5183 100644
--- a/content/2012/chat/http/chat.go
+++ b/content/2012/chat/http/chat.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/http/html.go b/content/2012/chat/http/html.go
index d4f7f359..b4e1fdc4 100644
--- a/content/2012/chat/http/html.go
+++ b/content/2012/chat/http/html.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/markov/chat.go b/content/2012/chat/markov/chat.go
index 5641189c..5654f3c4 100644
--- a/content/2012/chat/markov/chat.go
+++ b/content/2012/chat/markov/chat.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/markov/html.go b/content/2012/chat/markov/html.go
index d4f7f359..b4e1fdc4 100644
--- a/content/2012/chat/markov/html.go
+++ b/content/2012/chat/markov/html.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/markov/markov.go b/content/2012/chat/markov/markov.go
index 105a4e2e..97dfe413 100644
--- a/content/2012/chat/markov/markov.go
+++ b/content/2012/chat/markov/markov.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/chan.go b/content/2012/chat/support/chan.go
index a21f7408..fa27d245 100644
--- a/content/2012/chat/support/chan.go
+++ b/content/2012/chat/support/chan.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/defs.go b/content/2012/chat/support/defs.go
index 4ccc563f..1da4ee41 100644
--- a/content/2012/chat/support/defs.go
+++ b/content/2012/chat/support/defs.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/echo-no-concurrency.go b/content/2012/chat/support/echo-no-concurrency.go
index 5058efb0..a6aa2d73 100644
--- a/content/2012/chat/support/echo-no-concurrency.go
+++ b/content/2012/chat/support/echo-no-concurrency.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/echo.go b/content/2012/chat/support/echo.go
index db16657f..37dce1ec 100644
--- a/content/2012/chat/support/echo.go
+++ b/content/2012/chat/support/echo.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/embed.go b/content/2012/chat/support/embed.go
index b61cb8f3..fdecb210 100644
--- a/content/2012/chat/support/embed.go
+++ b/content/2012/chat/support/embed.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/goroutines.go b/content/2012/chat/support/goroutines.go
index d039d250..b86d97bd 100644
--- a/content/2012/chat/support/goroutines.go
+++ b/content/2012/chat/support/goroutines.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/hello-net.go b/content/2012/chat/support/hello-net.go
index d4fee8b8..298e5c77 100644
--- a/content/2012/chat/support/hello-net.go
+++ b/content/2012/chat/support/hello-net.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/hello-web.go b/content/2012/chat/support/hello-web.go
index 32f30824..020fb481 100644
--- a/content/2012/chat/support/hello-web.go
+++ b/content/2012/chat/support/hello-web.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/hello.go b/content/2012/chat/support/hello.go
index 5bfef314..0757c531 100644
--- a/content/2012/chat/support/hello.go
+++ b/content/2012/chat/support/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/select.go b/content/2012/chat/support/select.go
index db1ade8f..b236f413 100644
--- a/content/2012/chat/support/select.go
+++ b/content/2012/chat/support/select.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/support/websocket.go b/content/2012/chat/support/websocket.go
index 3e1c4696..5b056cad 100644
--- a/content/2012/chat/support/websocket.go
+++ b/content/2012/chat/support/websocket.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/tcp-simple/chat.go b/content/2012/chat/tcp-simple/chat.go
index 57ce08f5..93336919 100644
--- a/content/2012/chat/tcp-simple/chat.go
+++ b/content/2012/chat/tcp-simple/chat.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/chat/tcp/chat.go b/content/2012/chat/tcp/chat.go
index a9093fb1..c07fa27a 100644
--- a/content/2012/chat/tcp/chat.go
+++ b/content/2012/chat/tcp/chat.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/boring.go b/content/2012/concurrency/support/boring.go
index 2ce8aac6..b049ee0d 100644
--- a/content/2012/concurrency/support/boring.go
+++ b/content/2012/concurrency/support/boring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/changoboring.go b/content/2012/concurrency/support/changoboring.go
index 38f2d338..f534359e 100644
--- a/content/2012/concurrency/support/changoboring.go
+++ b/content/2012/concurrency/support/changoboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/chat.go b/content/2012/concurrency/support/chat.go
index 141c85cb..200451aa 100644
--- a/content/2012/concurrency/support/chat.go
+++ b/content/2012/concurrency/support/chat.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/daisy.go b/content/2012/concurrency/support/daisy.go
index de4889c3..0f398127 100644
--- a/content/2012/concurrency/support/daisy.go
+++ b/content/2012/concurrency/support/daisy.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/faninboring.go b/content/2012/concurrency/support/faninboring.go
index f856f9f9..08b3d800 100644
--- a/content/2012/concurrency/support/faninboring.go
+++ b/content/2012/concurrency/support/faninboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/generator2boring.go b/content/2012/concurrency/support/generator2boring.go
index 57adc771..45be6f82 100644
--- a/content/2012/concurrency/support/generator2boring.go
+++ b/content/2012/concurrency/support/generator2boring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/generatorboring.go b/content/2012/concurrency/support/generatorboring.go
index 8a400cc8..eeae3cad 100644
--- a/content/2012/concurrency/support/generatorboring.go
+++ b/content/2012/concurrency/support/generatorboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/goboring.go b/content/2012/concurrency/support/goboring.go
index d5363ecc..e28b6a3d 100644
--- a/content/2012/concurrency/support/goboring.go
+++ b/content/2012/concurrency/support/goboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/google.go b/content/2012/concurrency/support/google.go
index 93ca8480..10089d33 100644
--- a/content/2012/concurrency/support/google.go
+++ b/content/2012/concurrency/support/google.go
@@ -1,5 +1,5 @@
 
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/google2.1.go b/content/2012/concurrency/support/google2.1.go
index 0ed5eaf1..53be7536 100644
--- a/content/2012/concurrency/support/google2.1.go
+++ b/content/2012/concurrency/support/google2.1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/google2.2.go b/content/2012/concurrency/support/google2.2.go
index 0031b88f..2dac79fc 100644
--- a/content/2012/concurrency/support/google2.2.go
+++ b/content/2012/concurrency/support/google2.2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/google2.3.go b/content/2012/concurrency/support/google2.3.go
index 7d590ac1..93824304 100644
--- a/content/2012/concurrency/support/google2.3.go
+++ b/content/2012/concurrency/support/google2.3.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/google3.0.go b/content/2012/concurrency/support/google3.0.go
index 8e50e3c3..4188fcda 100644
--- a/content/2012/concurrency/support/google3.0.go
+++ b/content/2012/concurrency/support/google3.0.go
@@ -1,6 +1,6 @@
 
 
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/helpers.go b/content/2012/concurrency/support/helpers.go
index 7a1b15a5..a10c9cb3 100644
--- a/content/2012/concurrency/support/helpers.go
+++ b/content/2012/concurrency/support/helpers.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/lessboring.go b/content/2012/concurrency/support/lessboring.go
index d30ef4fd..5549d517 100644
--- a/content/2012/concurrency/support/lessboring.go
+++ b/content/2012/concurrency/support/lessboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/mainboring.go b/content/2012/concurrency/support/mainboring.go
index af90c8e5..31f1c1e8 100644
--- a/content/2012/concurrency/support/mainboring.go
+++ b/content/2012/concurrency/support/mainboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/quit.go b/content/2012/concurrency/support/quit.go
index cc16ca03..9e16caf9 100644
--- a/content/2012/concurrency/support/quit.go
+++ b/content/2012/concurrency/support/quit.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/rcvquit.go b/content/2012/concurrency/support/rcvquit.go
index e13a800a..855332e1 100644
--- a/content/2012/concurrency/support/rcvquit.go
+++ b/content/2012/concurrency/support/rcvquit.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/select.go b/content/2012/concurrency/support/select.go
index 14ed7acb..aa707afa 100644
--- a/content/2012/concurrency/support/select.go
+++ b/content/2012/concurrency/support/select.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/selectboring.go b/content/2012/concurrency/support/selectboring.go
index c1008288..78cb5c74 100644
--- a/content/2012/concurrency/support/selectboring.go
+++ b/content/2012/concurrency/support/selectboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/sequenceboring.go b/content/2012/concurrency/support/sequenceboring.go
index 40caf0c2..11174669 100644
--- a/content/2012/concurrency/support/sequenceboring.go
+++ b/content/2012/concurrency/support/sequenceboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/timeout.go b/content/2012/concurrency/support/timeout.go
index 9673a1b3..7d8cab97 100644
--- a/content/2012/concurrency/support/timeout.go
+++ b/content/2012/concurrency/support/timeout.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/timeoutall.go b/content/2012/concurrency/support/timeoutall.go
index 97a1c01f..5dd4a892 100644
--- a/content/2012/concurrency/support/timeoutall.go
+++ b/content/2012/concurrency/support/timeoutall.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/concurrency/support/waitgoboring.go b/content/2012/concurrency/support/waitgoboring.go
index cd5a7d6e..3fb1fb8b 100644
--- a/content/2012/concurrency/support/waitgoboring.go
+++ b/content/2012/concurrency/support/waitgoboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/go-docs/faninboring.go b/content/2012/go-docs/faninboring.go
index f856f9f9..08b3d800 100644
--- a/content/2012/go-docs/faninboring.go
+++ b/content/2012/go-docs/faninboring.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/adder.go b/content/2012/goforc/adder.go
index df4f4b3d..1ebc71ac 100644
--- a/content/2012/goforc/adder.go
+++ b/content/2012/goforc/adder.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/cat.go b/content/2012/goforc/cat.go
index dc17c41a..3979df17 100644
--- a/content/2012/goforc/cat.go
+++ b/content/2012/goforc/cat.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/celsius.go b/content/2012/goforc/celsius.go
index 34beb44e..ffb45726 100644
--- a/content/2012/goforc/celsius.go
+++ b/content/2012/goforc/celsius.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/channels.go b/content/2012/goforc/channels.go
index 7a1b15a5..a10c9cb3 100644
--- a/content/2012/goforc/channels.go
+++ b/content/2012/goforc/channels.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/communication1.go b/content/2012/goforc/communication1.go
index d1eb8432..4825227e 100644
--- a/content/2012/goforc/communication1.go
+++ b/content/2012/goforc/communication1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/communication2.go b/content/2012/goforc/communication2.go
index b2daa2b6..20c815b0 100644
--- a/content/2012/goforc/communication2.go
+++ b/content/2012/goforc/communication2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/consts.go b/content/2012/goforc/consts.go
index e120eb51..33cf2215 100644
--- a/content/2012/goforc/consts.go
+++ b/content/2012/goforc/consts.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/decls.go b/content/2012/goforc/decls.go
index 219fbbe3..b49dd4f0 100644
--- a/content/2012/goforc/decls.go
+++ b/content/2012/goforc/decls.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/example0.go b/content/2012/goforc/example0.go
index 41c8b482..fa1d0f78 100644
--- a/content/2012/goforc/example0.go
+++ b/content/2012/goforc/example0.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/example1.go b/content/2012/goforc/example1.go
index 7f9158fb..ced6d0e1 100644
--- a/content/2012/goforc/example1.go
+++ b/content/2012/goforc/example1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/example2.go b/content/2012/goforc/example2.go
index 6ea2de15..3b8504f3 100644
--- a/content/2012/goforc/example2.go
+++ b/content/2012/goforc/example2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/forloop.go b/content/2012/goforc/forloop.go
index 965bfa2b..12975c47 100644
--- a/content/2012/goforc/forloop.go
+++ b/content/2012/goforc/forloop.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/hello.go b/content/2012/goforc/hello.go
index b4804515..e4f48ab2 100644
--- a/content/2012/goforc/hello.go
+++ b/content/2012/goforc/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/interface.go b/content/2012/goforc/interface.go
index ab7c7554..02bc0f6a 100644
--- a/content/2012/goforc/interface.go
+++ b/content/2012/goforc/interface.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/point.go b/content/2012/goforc/point.go
index 31eb9ff9..2973d77a 100644
--- a/content/2012/goforc/point.go
+++ b/content/2012/goforc/point.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/stmts.go b/content/2012/goforc/stmts.go
index 06768d40..ae6a5c76 100644
--- a/content/2012/goforc/stmts.go
+++ b/content/2012/goforc/stmts.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/vars.go b/content/2012/goforc/vars.go
index 961558c7..101eaa79 100644
--- a/content/2012/goforc/vars.go
+++ b/content/2012/goforc/vars.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/worker1.go b/content/2012/goforc/worker1.go
index d60a02df..585af162 100644
--- a/content/2012/goforc/worker1.go
+++ b/content/2012/goforc/worker1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/goforc/worker2.go b/content/2012/goforc/worker2.go
index 568eff49..f995e9bd 100644
--- a/content/2012/goforc/worker2.go
+++ b/content/2012/goforc/worker2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/insidepresent/hello.go b/content/2012/insidepresent/hello.go
index 66ba0c6a..b62da0a1 100644
--- a/content/2012/insidepresent/hello.go
+++ b/content/2012/insidepresent/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/insidepresent/socket-simple.go b/content/2012/insidepresent/socket-simple.go
index 6bd22f52..20d5dde7 100644
--- a/content/2012/insidepresent/socket-simple.go
+++ b/content/2012/insidepresent/socket-simple.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/insidepresent/socket.go b/content/2012/insidepresent/socket.go
index ab2e4908..f53fa2ad 100644
--- a/content/2012/insidepresent/socket.go
+++ b/content/2012/insidepresent/socket.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/insidepresent/websocket.go b/content/2012/insidepresent/websocket.go
index 3e1c4696..5b056cad 100644
--- a/content/2012/insidepresent/websocket.go
+++ b/content/2012/insidepresent/websocket.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/flag.go b/content/2012/simple/flag.go
index 8abdf356..2606af32 100644
--- a/content/2012/simple/flag.go
+++ b/content/2012/simple/flag.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/hello-web.go b/content/2012/simple/hello-web.go
index 606dcef1..05d14399 100644
--- a/content/2012/simple/hello-web.go
+++ b/content/2012/simple/hello-web.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/hello.go b/content/2012/simple/hello.go
index 5bfef314..0757c531 100644
--- a/content/2012/simple/hello.go
+++ b/content/2012/simple/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/io/io.go b/content/2012/simple/io/io.go
index 10befccc..d0d975a4 100644
--- a/content/2012/simple/io/io.go
+++ b/content/2012/simple/io/io.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package io
 
diff --git a/content/2012/simple/json.go b/content/2012/simple/json.go
index ea38c1c6..aa91a926 100644
--- a/content/2012/simple/json.go
+++ b/content/2012/simple/json.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/reader.go b/content/2012/simple/reader.go
index 32ed052f..1aa4415d 100644
--- a/content/2012/simple/reader.go
+++ b/content/2012/simple/reader.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/test.go b/content/2012/simple/test.go
index 0a64c0e5..1e673619 100644
--- a/content/2012/simple/test.go
+++ b/content/2012/simple/test.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/test/string_test.go b/content/2012/simple/test/string_test.go
index f943c50f..a65ff9d5 100644
--- a/content/2012/simple/test/string_test.go
+++ b/content/2012/simple/test/string_test.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package string_test
 
diff --git a/content/2012/simple/time.go b/content/2012/simple/time.go
index e4f33b9e..c73963fd 100644
--- a/content/2012/simple/time.go
+++ b/content/2012/simple/time.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/time2.go b/content/2012/simple/time2.go
index f13ba878..bd7273c2 100644
--- a/content/2012/simple/time2.go
+++ b/content/2012/simple/time2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/time3.go b/content/2012/simple/time3.go
index 76c998f9..d0e1ba35 100644
--- a/content/2012/simple/time3.go
+++ b/content/2012/simple/time3.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/simple/webfront/main.go b/content/2012/simple/webfront/main.go
index 60349928..bf28dec7 100644
--- a/content/2012/simple/webfront/main.go
+++ b/content/2012/simple/webfront/main.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 // This is a somewhat cut back version of webfront, available at
 // http://github.com/nf/webfront
diff --git a/content/2012/simple/webfront/server_test.go b/content/2012/simple/webfront/server_test.go
index a153ec2f..5fe9a784 100644
--- a/content/2012/simple/webfront/server_test.go
+++ b/content/2012/simple/webfront/server_test.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 /*
 Copyright 2011 Google Inc.
diff --git a/content/2012/tutorial/1get.go b/content/2012/tutorial/1get.go
index 0d692b7c..98b914b1 100644
--- a/content/2012/tutorial/1get.go
+++ b/content/2012/tutorial/1get.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/tutorial/2json.go b/content/2012/tutorial/2json.go
index 1a9b881b..0e0bf8fa 100644
--- a/content/2012/tutorial/2json.go
+++ b/content/2012/tutorial/2json.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/tutorial/3func.go b/content/2012/tutorial/3func.go
index 34cf6730..afc8a64d 100644
--- a/content/2012/tutorial/3func.go
+++ b/content/2012/tutorial/3func.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/tutorial/4method.go b/content/2012/tutorial/4method.go
index 7b616a7e..2cef8620 100644
--- a/content/2012/tutorial/4method.go
+++ b/content/2012/tutorial/4method.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/tutorial/hello.go b/content/2012/tutorial/hello.go
index 9291c219..0f04e20a 100644
--- a/content/2012/tutorial/hello.go
+++ b/content/2012/tutorial/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/tutorial/jsonserve.go b/content/2012/tutorial/jsonserve.go
index a0d1b737..d5131970 100644
--- a/content/2012/tutorial/jsonserve.go
+++ b/content/2012/tutorial/jsonserve.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/tutorial/main.go b/content/2012/tutorial/main.go
index f6e12b78..10fcad6b 100644
--- a/content/2012/tutorial/main.go
+++ b/content/2012/tutorial/main.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/tutorial/reddit/reddit.go b/content/2012/tutorial/reddit/reddit.go
index c5a22ebb..38483985 100644
--- a/content/2012/tutorial/reddit/reddit.go
+++ b/content/2012/tutorial/reddit/reddit.go
@@ -1,5 +1,5 @@
 // Package reddit implements a basic client for the Reddit API.
-// +build OMIT
+// +build ignore,OMIT
 
 package reddit
 
diff --git a/content/2012/waza/balance.go b/content/2012/waza/balance.go
index c5840e49..e97976e3 100644
--- a/content/2012/waza/balance.go
+++ b/content/2012/waza/balance.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/zen/hello.go b/content/2012/zen/hello.go
index 645295a3..04c77b15 100644
--- a/content/2012/zen/hello.go
+++ b/content/2012/zen/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/zen/http.go b/content/2012/zen/http.go
index 717d77da..f3b25f7b 100644
--- a/content/2012/zen/http.go
+++ b/content/2012/zen/http.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/zen/jsonformat.go b/content/2012/zen/jsonformat.go
index 46720100..fdffcde8 100644
--- a/content/2012/zen/jsonformat.go
+++ b/content/2012/zen/jsonformat.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2012/zen/race.go b/content/2012/zen/race.go
index f4063a0d..99ba553e 100644
--- a/content/2012/zen/race.go
+++ b/content/2012/zen/race.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/advconc/buffer/buffer.go b/content/2013/advconc/buffer/buffer.go
index ca9bdc19..9f6937ca 100644
--- a/content/2013/advconc/buffer/buffer.go
+++ b/content/2013/advconc/buffer/buffer.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/advconc/dedupermain/dedupermain.go b/content/2013/advconc/dedupermain/dedupermain.go
index fc1f422d..a426c155 100644
--- a/content/2013/advconc/dedupermain/dedupermain.go
+++ b/content/2013/advconc/dedupermain/dedupermain.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 // dedupermain runs the Subscribe example with several duplicate
 // subscriptions to demonstrate deduping.
diff --git a/content/2013/advconc/fakemain/fakemain.go b/content/2013/advconc/fakemain/fakemain.go
index f347e860..049a71d7 100644
--- a/content/2013/advconc/fakemain/fakemain.go
+++ b/content/2013/advconc/fakemain/fakemain.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 // fakemain runs the Subscribe example with a fake RSS fetcher.
 package main
diff --git a/content/2013/advconc/naivemain/naivemain.go b/content/2013/advconc/naivemain/naivemain.go
index 3f8387f3..ec3c5ade 100644
--- a/content/2013/advconc/naivemain/naivemain.go
+++ b/content/2013/advconc/naivemain/naivemain.go
@@ -1,6 +1,6 @@
 // naivemain runs the Subscribe example with the naive Subscribe
 // implementation and a fake RSS fetcher.
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/advconc/nilselect/nilselect.go b/content/2013/advconc/nilselect/nilselect.go
index 3a9ff713..a7525807 100644
--- a/content/2013/advconc/nilselect/nilselect.go
+++ b/content/2013/advconc/nilselect/nilselect.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/advconc/pingpong/pingpong.go b/content/2013/advconc/pingpong/pingpong.go
index 159d2c5f..fd350b43 100644
--- a/content/2013/advconc/pingpong/pingpong.go
+++ b/content/2013/advconc/pingpong/pingpong.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/advconc/pingpong1.go b/content/2013/advconc/pingpong1.go
index 159d2c5f..fd350b43 100644
--- a/content/2013/advconc/pingpong1.go
+++ b/content/2013/advconc/pingpong1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/advconc/pingpongdeadlock/pingpongdeadlock.go b/content/2013/advconc/pingpongdeadlock/pingpongdeadlock.go
index 9764237b..d5edff12 100644
--- a/content/2013/advconc/pingpongdeadlock/pingpongdeadlock.go
+++ b/content/2013/advconc/pingpongdeadlock/pingpongdeadlock.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/advconc/pingpongpanic/pingpongpanic.go b/content/2013/advconc/pingpongpanic/pingpongpanic.go
index cd0a9e67..562b73be 100644
--- a/content/2013/advconc/pingpongpanic/pingpongpanic.go
+++ b/content/2013/advconc/pingpongpanic/pingpongpanic.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/advconc/realmain/realmain.go b/content/2013/advconc/realmain/realmain.go
index 6be5499d..7813f86b 100644
--- a/content/2013/advconc/realmain/realmain.go
+++ b/content/2013/advconc/realmain/realmain.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 // realmain runs the Subscribe example with a real RSS fetcher.
 package main
diff --git a/content/2013/bestpractices/shortercode1.go b/content/2013/bestpractices/shortercode1.go
index cfcbc74e..d615a87d 100644
--- a/content/2013/bestpractices/shortercode1.go
+++ b/content/2013/bestpractices/shortercode1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/bestpractices/shortercode2.go b/content/2013/bestpractices/shortercode2.go
index 4971dbe3..25ed0ae0 100644
--- a/content/2013/bestpractices/shortercode2.go
+++ b/content/2013/bestpractices/shortercode2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/bestpractices/shortercode3.go b/content/2013/bestpractices/shortercode3.go
index 47eca968..7e77b5b0 100644
--- a/content/2013/bestpractices/shortercode3.go
+++ b/content/2013/bestpractices/shortercode3.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/bestpractices/shortercode4.go b/content/2013/bestpractices/shortercode4.go
index a026463e..0c20cebf 100644
--- a/content/2013/bestpractices/shortercode4.go
+++ b/content/2013/bestpractices/shortercode4.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/bestpractices/shortercode5.go b/content/2013/bestpractices/shortercode5.go
index e9234bfd..b755b521 100644
--- a/content/2013/bestpractices/shortercode5.go
+++ b/content/2013/bestpractices/shortercode5.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/bestpractices/shortercode6.go b/content/2013/bestpractices/shortercode6.go
index 0c6a79c1..596224cf 100644
--- a/content/2013/bestpractices/shortercode6.go
+++ b/content/2013/bestpractices/shortercode6.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/addr1.go b/content/2013/distsys/addr1.go
index 7ff39860..e8cea401 100644
--- a/content/2013/distsys/addr1.go
+++ b/content/2013/distsys/addr1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/addr2.go b/content/2013/distsys/addr2.go
index 9a307efd..272e5397 100644
--- a/content/2013/distsys/addr2.go
+++ b/content/2013/distsys/addr2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/addr3.go b/content/2013/distsys/addr3.go
index 9c1c2931..4dfc0909 100644
--- a/content/2013/distsys/addr3.go
+++ b/content/2013/distsys/addr3.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/addr4.go b/content/2013/distsys/addr4.go
index fb7bdb43..76e46659 100644
--- a/content/2013/distsys/addr4.go
+++ b/content/2013/distsys/addr4.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/addr5.go b/content/2013/distsys/addr5.go
index 42874992..38b9e22d 100644
--- a/content/2013/distsys/addr5.go
+++ b/content/2013/distsys/addr5.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/finger.go b/content/2013/distsys/finger.go
index de305fc6..a9677c02 100644
--- a/content/2013/distsys/finger.go
+++ b/content/2013/distsys/finger.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/hello.go b/content/2013/distsys/hello.go
index 6e52b381..32efb51e 100644
--- a/content/2013/distsys/hello.go
+++ b/content/2013/distsys/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/hello0.go b/content/2013/distsys/hello0.go
index 55a2c1b3..270d531b 100644
--- a/content/2013/distsys/hello0.go
+++ b/content/2013/distsys/hello0.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/hello1.go b/content/2013/distsys/hello1.go
index 31475f25..b423278b 100644
--- a/content/2013/distsys/hello1.go
+++ b/content/2013/distsys/hello1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/replread.go b/content/2013/distsys/replread.go
index 911ba50f..8c301fee 100644
--- a/content/2013/distsys/replread.go
+++ b/content/2013/distsys/replread.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/replwrite.go b/content/2013/distsys/replwrite.go
index 3d48603f..c7fa03c7 100644
--- a/content/2013/distsys/replwrite.go
+++ b/content/2013/distsys/replwrite.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/writebuffer.go b/content/2013/distsys/writebuffer.go
index 8ac1c7ae..94d75c45 100644
--- a/content/2013/distsys/writebuffer.go
+++ b/content/2013/distsys/writebuffer.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/distsys/writebuffer2.go b/content/2013/distsys/writebuffer2.go
index 3dba109f..5977c7f8 100644
--- a/content/2013/distsys/writebuffer2.go
+++ b/content/2013/distsys/writebuffer2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go-sreops/goroutines-channels.go b/content/2013/go-sreops/goroutines-channels.go
index a2346d67..9c149bd8 100644
--- a/content/2013/go-sreops/goroutines-channels.go
+++ b/content/2013/go-sreops/goroutines-channels.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go-sreops/goroutines.go b/content/2013/go-sreops/goroutines.go
index 17e0c2da..cec0ef33 100644
--- a/content/2013/go-sreops/goroutines.go
+++ b/content/2013/go-sreops/goroutines.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go-sreops/hello.go b/content/2013/go-sreops/hello.go
index adaeee12..11bebb1a 100644
--- a/content/2013/go-sreops/hello.go
+++ b/content/2013/go-sreops/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/chanof.go b/content/2013/go1.1/chanof.go
index c3589254..1515088c 100644
--- a/content/2013/go1.1/chanof.go
+++ b/content/2013/go1.1/chanof.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/intdiv.go b/content/2013/go1.1/intdiv.go
index cdfedd04..d06ec333 100644
--- a/content/2013/go1.1/intdiv.go
+++ b/content/2013/go1.1/intdiv.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/makefunc.go b/content/2013/go1.1/makefunc.go
index 6846f971..52932d2b 100644
--- a/content/2013/go1.1/makefunc.go
+++ b/content/2013/go1.1/makefunc.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/methodvals-old.go b/content/2013/go1.1/methodvals-old.go
index 64a3b06b..7ff23d6b 100644
--- a/content/2013/go1.1/methodvals-old.go
+++ b/content/2013/go1.1/methodvals-old.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/methodvals.go b/content/2013/go1.1/methodvals.go
index d7d02bca..112f7bca 100644
--- a/content/2013/go1.1/methodvals.go
+++ b/content/2013/go1.1/methodvals.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/race.go b/content/2013/go1.1/race.go
index 784cf194..c03b25c0 100644
--- a/content/2013/go1.1/race.go
+++ b/content/2013/go1.1/race.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/return-old.go b/content/2013/go1.1/return-old.go
index 168850a8..f9f0463a 100644
--- a/content/2013/go1.1/return-old.go
+++ b/content/2013/go1.1/return-old.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/return.go b/content/2013/go1.1/return.go
index 0149ad3f..2096bc9f 100644
--- a/content/2013/go1.1/return.go
+++ b/content/2013/go1.1/return.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/scanner.go b/content/2013/go1.1/scanner.go
index 00d8ae2a..45eaf424 100644
--- a/content/2013/go1.1/scanner.go
+++ b/content/2013/go1.1/scanner.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/scanner2.go b/content/2013/go1.1/scanner2.go
index de5c94a8..2388034a 100644
--- a/content/2013/go1.1/scanner2.go
+++ b/content/2013/go1.1/scanner2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/timer.go b/content/2013/go1.1/timer.go
index 61a0b27e..300ea733 100644
--- a/content/2013/go1.1/timer.go
+++ b/content/2013/go1.1/timer.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go1.1/yearday.go b/content/2013/go1.1/yearday.go
index 5400825a..a8969701 100644
--- a/content/2013/go1.1/yearday.go
+++ b/content/2013/go1.1/yearday.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go4python/deco.go b/content/2013/go4python/deco.go
index 3b5bd79b..5e80e255 100644
--- a/content/2013/go4python/deco.go
+++ b/content/2013/go4python/deco.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go4python/decoex.go b/content/2013/go4python/decoex.go
index 77ad544f..3323b424 100644
--- a/content/2013/go4python/decoex.go
+++ b/content/2013/go4python/decoex.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go4python/fib-gen.go b/content/2013/go4python/fib-gen.go
index 29d189e4..30521f8e 100644
--- a/content/2013/go4python/fib-gen.go
+++ b/content/2013/go4python/fib-gen.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go4python/fib-gen2.go b/content/2013/go4python/fib-gen2.go
index f3df3c2a..f1851523 100644
--- a/content/2013/go4python/fib-gen2.go
+++ b/content/2013/go4python/fib-gen2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go4python/fib.go b/content/2013/go4python/fib.go
index 2c0547f0..b014ecc4 100644
--- a/content/2013/go4python/fib.go
+++ b/content/2013/go4python/fib.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go4python/genex.go b/content/2013/go4python/genex.go
index 9ee48a65..661a1538 100644
--- a/content/2013/go4python/genex.go
+++ b/content/2013/go4python/genex.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go4python/genex2.go b/content/2013/go4python/genex2.go
index 1b465094..f6caa715 100644
--- a/content/2013/go4python/genex2.go
+++ b/content/2013/go4python/genex2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go4python/monkey.go b/content/2013/go4python/monkey.go
index dfcd61d0..1a5bc369 100644
--- a/content/2013/go4python/monkey.go
+++ b/content/2013/go4python/monkey.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/go4python/typesandmethods.go b/content/2013/go4python/typesandmethods.go
index fa7d5da7..6690b4d6 100644
--- a/content/2013/go4python/typesandmethods.go
+++ b/content/2013/go4python/typesandmethods.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2013/highperf/longtail.go b/content/2013/highperf/longtail.go
index efb48966..c097d6c6 100644
--- a/content/2013/highperf/longtail.go
+++ b/content/2013/highperf/longtail.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package pkg
 
diff --git a/content/2013/highperf/mart/1/mart.go b/content/2013/highperf/mart/1/mart.go
index 19faba89..51d39c5d 100644
--- a/content/2013/highperf/mart/1/mart.go
+++ b/content/2013/highperf/mart/1/mart.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package mart
 
diff --git a/content/2013/highperf/mart/2/mart.go b/content/2013/highperf/mart/2/mart.go
index f478c9fc..6c10c593 100644
--- a/content/2013/highperf/mart/2/mart.go
+++ b/content/2013/highperf/mart/2/mart.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package mart
 
diff --git a/content/2013/highperf/mart/3/mart.go b/content/2013/highperf/mart/3/mart.go
index e176802c..49c341ad 100644
--- a/content/2013/highperf/mart/3/mart.go
+++ b/content/2013/highperf/mart/3/mart.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package mart
 
diff --git a/content/2014/go4gophers/chain.go b/content/2014/go4gophers/chain.go
index a73a8686..f1bde43e 100644
--- a/content/2014/go4gophers/chain.go
+++ b/content/2014/go4gophers/chain.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4gophers/organs.go b/content/2014/go4gophers/organs.go
index 209a035e..60c1092e 100644
--- a/content/2014/go4gophers/organs.go
+++ b/content/2014/go4gophers/organs.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4gophers/organs2.go b/content/2014/go4gophers/organs2.go
index acd9fe37..50c13e49 100644
--- a/content/2014/go4gophers/organs2.go
+++ b/content/2014/go4gophers/organs2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4gophers/organs3.go b/content/2014/go4gophers/organs3.go
index 98ced84f..3a0b116d 100644
--- a/content/2014/go4gophers/organs3.go
+++ b/content/2014/go4gophers/organs3.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4gophers/reader.go b/content/2014/go4gophers/reader.go
index a548d616..fa130287 100644
--- a/content/2014/go4gophers/reader.go
+++ b/content/2014/go4gophers/reader.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4gophers/sort.go b/content/2014/go4gophers/sort.go
index 48d7fde0..35b5c271 100644
--- a/content/2014/go4gophers/sort.go
+++ b/content/2014/go4gophers/sort.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4gophers/tree-nothread.go b/content/2014/go4gophers/tree-nothread.go
index 04b188ea..3b5c1999 100644
--- a/content/2014/go4gophers/tree-nothread.go
+++ b/content/2014/go4gophers/tree-nothread.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4gophers/tree-select.go b/content/2014/go4gophers/tree-select.go
index 4082d932..de8cad58 100644
--- a/content/2014/go4gophers/tree-select.go
+++ b/content/2014/go4gophers/tree-select.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4gophers/tree-thread.go b/content/2014/go4gophers/tree-thread.go
index 32162c56..38950444 100644
--- a/content/2014/go4gophers/tree-thread.go
+++ b/content/2014/go4gophers/tree-thread.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4gophers/tree-walk.go b/content/2014/go4gophers/tree-walk.go
index 5a06f3ec..c43c0e76 100644
--- a/content/2014/go4gophers/tree-walk.go
+++ b/content/2014/go4gophers/tree-walk.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/battle.go b/content/2014/go4java/battle.go
index 8fc95052..fde600c2 100644
--- a/content/2014/go4java/battle.go
+++ b/content/2014/go4java/battle.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/chan.go b/content/2014/go4java/chan.go
index c9ea793e..424fa73c 100644
--- a/content/2014/go4java/chan.go
+++ b/content/2014/go4java/chan.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/conc1.go b/content/2014/go4java/conc1.go
index 9d114bc3..b1a599d4 100644
--- a/content/2014/go4java/conc1.go
+++ b/content/2014/go4java/conc1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/conc2.go b/content/2014/go4java/conc2.go
index 9fc8aa33..129854e3 100644
--- a/content/2014/go4java/conc2.go
+++ b/content/2014/go4java/conc2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/conc3.go b/content/2014/go4java/conc3.go
index ada59d19..1fe09cfe 100644
--- a/content/2014/go4java/conc3.go
+++ b/content/2014/go4java/conc3.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/embedsample.go b/content/2014/go4java/embedsample.go
index d14a75c9..48cc2674 100644
--- a/content/2014/go4java/embedsample.go
+++ b/content/2014/go4java/embedsample.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/goodcounter.go b/content/2014/go4java/goodcounter.go
index 510bfafe..e839a943 100644
--- a/content/2014/go4java/goodcounter.go
+++ b/content/2014/go4java/goodcounter.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/goroutines.go b/content/2014/go4java/goroutines.go
index d137b3ad..cdcdb85f 100644
--- a/content/2014/go4java/goroutines.go
+++ b/content/2014/go4java/goroutines.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/loopback.go b/content/2014/go4java/loopback.go
index 63e8b93f..8f7646bc 100644
--- a/content/2014/go4java/loopback.go
+++ b/content/2014/go4java/loopback.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/go4java/writecounter.go b/content/2014/go4java/writecounter.go
index 379ca0b9..e1001403 100644
--- a/content/2014/go4java/writecounter.go
+++ b/content/2014/go4java/writecounter.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/gotham-context/after.go b/content/2014/gotham-context/after.go
index c86662c1..dbec8690 100644
--- a/content/2014/gotham-context/after.go
+++ b/content/2014/gotham-context/after.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package after
 
diff --git a/content/2014/gotham-context/before.go b/content/2014/gotham-context/before.go
index 79a1efad..1da89ef2 100644
--- a/content/2014/gotham-context/before.go
+++ b/content/2014/gotham-context/before.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package before
 
diff --git a/content/2014/gotham-context/eg.go b/content/2014/gotham-context/eg.go
index c314f4d6..7f9e9fb1 100644
--- a/content/2014/gotham-context/eg.go
+++ b/content/2014/gotham-context/eg.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package P
 
diff --git a/content/2014/gotham-context/first-context.go b/content/2014/gotham-context/first-context.go
index dde0ffa9..774d881c 100644
--- a/content/2014/gotham-context/first-context.go
+++ b/content/2014/gotham-context/first-context.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/gotham-context/first.go b/content/2014/gotham-context/first.go
index 47bee60a..e267a816 100644
--- a/content/2014/gotham-context/first.go
+++ b/content/2014/gotham-context/first.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/gotham-context/interface.go b/content/2014/gotham-context/interface.go
index a203450d..51450c58 100644
--- a/content/2014/gotham-context/interface.go
+++ b/content/2014/gotham-context/interface.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package context
 
diff --git a/content/2014/gothamgo-android/red.go b/content/2014/gothamgo-android/red.go
index 110f14af..b00a0cf3 100644
--- a/content/2014/gothamgo-android/red.go
+++ b/content/2014/gothamgo-android/red.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/gothamgo-android/touch.go b/content/2014/gothamgo-android/touch.go
index 0737130d..7091c1da 100644
--- a/content/2014/gothamgo-android/touch.go
+++ b/content/2014/gothamgo-android/touch.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/deadlock.go b/content/2014/playground/deadlock.go
index 2ff641ad..9726526d 100644
--- a/content/2014/playground/deadlock.go
+++ b/content/2014/playground/deadlock.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/file.go b/content/2014/playground/file.go
index cf0cd32f..0444e7d9 100644
--- a/content/2014/playground/file.go
+++ b/content/2014/playground/file.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/heap.go b/content/2014/playground/heap.go
index 83cd104b..c8fd3031 100644
--- a/content/2014/playground/heap.go
+++ b/content/2014/playground/heap.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/hello.go b/content/2014/playground/hello.go
index b24f3784..c1248a05 100644
--- a/content/2014/playground/hello.go
+++ b/content/2014/playground/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/http.go b/content/2014/playground/http.go
index 18c6e399..24f32b06 100644
--- a/content/2014/playground/http.go
+++ b/content/2014/playground/http.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/loop.go b/content/2014/playground/loop.go
index 7b400997..26005a90 100644
--- a/content/2014/playground/loop.go
+++ b/content/2014/playground/loop.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/net.go b/content/2014/playground/net.go
index eb8b759c..eebdc464 100644
--- a/content/2014/playground/net.go
+++ b/content/2014/playground/net.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/removeall.go b/content/2014/playground/removeall.go
index 5121ca7b..def5665e 100644
--- a/content/2014/playground/removeall.go
+++ b/content/2014/playground/removeall.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/rm.go b/content/2014/playground/rm.go
index 27c53d58..de69f3ab 100644
--- a/content/2014/playground/rm.go
+++ b/content/2014/playground/rm.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/sleep.go b/content/2014/playground/sleep.go
index a38d5974..6d6e2713 100644
--- a/content/2014/playground/sleep.go
+++ b/content/2014/playground/sleep.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/sleepfast.go b/content/2014/playground/sleepfast.go
index f3cd8ddc..e275d1d4 100644
--- a/content/2014/playground/sleepfast.go
+++ b/content/2014/playground/sleepfast.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/playground/stack.go b/content/2014/playground/stack.go
index d2a0a0e9..0f884f6e 100644
--- a/content/2014/playground/stack.go
+++ b/content/2014/playground/stack.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/readability/close-cond-bad.go b/content/2014/readability/close-cond-bad.go
index 32b0dc9d..b00b6381 100644
--- a/content/2014/readability/close-cond-bad.go
+++ b/content/2014/readability/close-cond-bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 type Stream struct {
diff --git a/content/2014/readability/close-cond-good.go b/content/2014/readability/close-cond-good.go
index 362395ae..530e9b49 100644
--- a/content/2014/readability/close-cond-good.go
+++ b/content/2014/readability/close-cond-good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 type Stream struct {
diff --git a/content/2014/readability/err_close_write_bad.go b/content/2014/readability/err_close_write_bad.go
index 563a9a4a..8de94976 100644
--- a/content/2014/readability/err_close_write_bad.go
+++ b/content/2014/readability/err_close_write_bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/err_close_write_good.go b/content/2014/readability/err_close_write_good.go
index a5859ce1..8a227ab2 100644
--- a/content/2014/readability/err_close_write_good.go
+++ b/content/2014/readability/err_close_write_good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/err_regexp_bad.go b/content/2014/readability/err_regexp_bad.go
index 021481a5..b640203a 100644
--- a/content/2014/readability/err_regexp_bad.go
+++ b/content/2014/readability/err_regexp_bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/err_regexp_good.go b/content/2014/readability/err_regexp_good.go
index fd34e256..b68c5ff7 100644
--- a/content/2014/readability/err_regexp_good.go
+++ b/content/2014/readability/err_regexp_good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/example_test.go b/content/2014/readability/example_test.go
index ba50efa6..b6686f82 100644
--- a/content/2014/readability/example_test.go
+++ b/content/2014/readability/example_test.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package binary // OMIT
 
diff --git a/content/2014/readability/if-else-bad.go b/content/2014/readability/if-else-bad.go
index c0f862f2..c5a2a710 100644
--- a/content/2014/readability/if-else-bad.go
+++ b/content/2014/readability/if-else-bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/if-else-good.go b/content/2014/readability/if-else-good.go
index cad9f221..a033a008 100644
--- a/content/2014/readability/if-else-good.go
+++ b/content/2014/readability/if-else-good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/if-switch-bad.go b/content/2014/readability/if-switch-bad.go
index e6f99fbd..e0f98744 100644
--- a/content/2014/readability/if-switch-bad.go
+++ b/content/2014/readability/if-switch-bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/if-switch-good.go b/content/2014/readability/if-switch-good.go
index 64abe174..cc20864d 100644
--- a/content/2014/readability/if-switch-good.go
+++ b/content/2014/readability/if-switch-good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/implement-interface-bad.go b/content/2014/readability/implement-interface-bad.go
index 375de27b..c96f4c37 100644
--- a/content/2014/readability/implement-interface-bad.go
+++ b/content/2014/readability/implement-interface-bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/implement-interface-good.go b/content/2014/readability/implement-interface-good.go
index 93c89705..697ba953 100644
--- a/content/2014/readability/implement-interface-good.go
+++ b/content/2014/readability/implement-interface-good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/in-band-error-client.go b/content/2014/readability/in-band-error-client.go
index b2e13fc2..0ae45908 100644
--- a/content/2014/readability/in-band-error-client.go
+++ b/content/2014/readability/in-band-error-client.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package client // OMIT
 
diff --git a/content/2014/readability/in-band-error.go b/content/2014/readability/in-band-error.go
index 47ae9b3c..cc8cb5e7 100644
--- a/content/2014/readability/in-band-error.go
+++ b/content/2014/readability/in-band-error.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/long-line-fold.go b/content/2014/readability/long-line-fold.go
index af53f636..324327ae 100644
--- a/content/2014/readability/long-line-fold.go
+++ b/content/2014/readability/long-line-fold.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sampling
 
diff --git a/content/2014/readability/long-line-nofold.go b/content/2014/readability/long-line-nofold.go
index a13a7e5b..0baec8b1 100644
--- a/content/2014/readability/long-line-nofold.go
+++ b/content/2014/readability/long-line-nofold.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sampling
 
diff --git a/content/2014/readability/long-line-short.go b/content/2014/readability/long-line-short.go
index 376445f2..1b91da95 100644
--- a/content/2014/readability/long-line-short.go
+++ b/content/2014/readability/long-line-short.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sampling
 
diff --git a/content/2014/readability/nil_error.go b/content/2014/readability/nil_error.go
index 352e39cf..0ad26b7e 100644
--- a/content/2014/readability/nil_error.go
+++ b/content/2014/readability/nil_error.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main // OMIT
 
diff --git a/content/2014/readability/nil_interface_en.go b/content/2014/readability/nil_interface_en.go
index b3bde3b7..8969e889 100644
--- a/content/2014/readability/nil_interface_en.go
+++ b/content/2014/readability/nil_interface_en.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main // OMIT
 
diff --git a/content/2014/readability/reflect-bad.go b/content/2014/readability/reflect-bad.go
index f7f11f66..adbc01a2 100644
--- a/content/2014/readability/reflect-bad.go
+++ b/content/2014/readability/reflect-bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/reflect-good.go b/content/2014/readability/reflect-good.go
index ad762b5b..55a6d922 100644
--- a/content/2014/readability/reflect-good.go
+++ b/content/2014/readability/reflect-good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/resthandler-fix2.go b/content/2014/readability/resthandler-fix2.go
index 69d62bb0..2f26b357 100644
--- a/content/2014/readability/resthandler-fix2.go
+++ b/content/2014/readability/resthandler-fix2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package resthandler // OMIT
 
diff --git a/content/2014/readability/resthandler.go b/content/2014/readability/resthandler.go
index c2744841..d5c790a0 100644
--- a/content/2014/readability/resthandler.go
+++ b/content/2014/readability/resthandler.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package resthandler // OMIT
 
diff --git a/content/2014/readability/struct-field-bad.go b/content/2014/readability/struct-field-bad.go
index 319cb666..c3afe11c 100644
--- a/content/2014/readability/struct-field-bad.go
+++ b/content/2014/readability/struct-field-bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/struct-field-good.go b/content/2014/readability/struct-field-good.go
index eb71c888..9774716c 100644
--- a/content/2014/readability/struct-field-good.go
+++ b/content/2014/readability/struct-field-good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/test-pattern_en.go b/content/2014/readability/test-pattern_en.go
index 4e70184e..6312e097 100644
--- a/content/2014/readability/test-pattern_en.go
+++ b/content/2014/readability/test-pattern_en.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/time_duration_bad.go b/content/2014/readability/time_duration_bad.go
index c872eefb..afa1d5e6 100644
--- a/content/2014/readability/time_duration_bad.go
+++ b/content/2014/readability/time_duration_bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/time_duration_bad1.go b/content/2014/readability/time_duration_bad1.go
index 90c87f15..e78f819f 100644
--- a/content/2014/readability/time_duration_bad1.go
+++ b/content/2014/readability/time_duration_bad1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/time_duration_bad2.go b/content/2014/readability/time_duration_bad2.go
index 82aa9c30..a1853858 100644
--- a/content/2014/readability/time_duration_bad2.go
+++ b/content/2014/readability/time_duration_bad2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/time_duration_good.go b/content/2014/readability/time_duration_good.go
index 22ed8a39..6af1e5da 100644
--- a/content/2014/readability/time_duration_good.go
+++ b/content/2014/readability/time_duration_good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/readability/val-and-error.go b/content/2014/readability/val-and-error.go
index d3106d78..ae6aeb72 100644
--- a/content/2014/readability/val-and-error.go
+++ b/content/2014/readability/val-and-error.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package sample // OMIT
 
diff --git a/content/2014/research2/addr1.go b/content/2014/research2/addr1.go
index 7ff39860..e8cea401 100644
--- a/content/2014/research2/addr1.go
+++ b/content/2014/research2/addr1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/research2/addr2.go b/content/2014/research2/addr2.go
index 4f9078f3..34759972 100644
--- a/content/2014/research2/addr2.go
+++ b/content/2014/research2/addr2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/research2/hello.go b/content/2014/research2/hello.go
index 6e52b381..32efb51e 100644
--- a/content/2014/research2/hello.go
+++ b/content/2014/research2/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/static-analysis/demo.go b/content/2014/static-analysis/demo.go
index af7bd2ce..fff9e7a6 100644
--- a/content/2014/static-analysis/demo.go
+++ b/content/2014/static-analysis/demo.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/static-analysis/fib.go b/content/2014/static-analysis/fib.go
index 930231b4..e0c94622 100644
--- a/content/2014/static-analysis/fib.go
+++ b/content/2014/static-analysis/fib.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/static-analysis/hello.go b/content/2014/static-analysis/hello.go
index b4804515..e4f48ab2 100644
--- a/content/2014/static-analysis/hello.go
+++ b/content/2014/static-analysis/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/static-analysis/template.go b/content/2014/static-analysis/template.go
index 203c2a3d..7c16792e 100644
--- a/content/2014/static-analysis/template.go
+++ b/content/2014/static-analysis/template.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package P
 
diff --git a/content/2014/taste/concurrency1.go b/content/2014/taste/concurrency1.go
index 973a8c07..f0c456fe 100644
--- a/content/2014/taste/concurrency1.go
+++ b/content/2014/taste/concurrency1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/concurrency2.go b/content/2014/taste/concurrency2.go
index 6c054524..cc496c11 100644
--- a/content/2014/taste/concurrency2.go
+++ b/content/2014/taste/concurrency2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/examples.go b/content/2014/taste/examples.go
index 4e462c59..e353e4ca 100644
--- a/content/2014/taste/examples.go
+++ b/content/2014/taste/examples.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package examples
 
diff --git a/content/2014/taste/hello.go b/content/2014/taste/hello.go
index 1725b6e3..c84b1d7b 100644
--- a/content/2014/taste/hello.go
+++ b/content/2014/taste/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/histo.go b/content/2014/taste/histo.go
index 27b6d381..acf6a4c2 100644
--- a/content/2014/taste/histo.go
+++ b/content/2014/taste/histo.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/histo0.go b/content/2014/taste/histo0.go
index b7451e6a..2c321ed6 100644
--- a/content/2014/taste/histo0.go
+++ b/content/2014/taste/histo0.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/histop.go b/content/2014/taste/histop.go
index ecedfd31..6f59e1e7 100644
--- a/content/2014/taste/histop.go
+++ b/content/2014/taste/histop.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/idents.go b/content/2014/taste/idents.go
index bf540462..767b6d53 100644
--- a/content/2014/taste/idents.go
+++ b/content/2014/taste/idents.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main // idents.go
 
diff --git a/content/2014/taste/point.go b/content/2014/taste/point.go
index 5b2f5b5f..248730d2 100644
--- a/content/2014/taste/point.go
+++ b/content/2014/taste/point.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/sort.go b/content/2014/taste/sort.go
index 320e4b8b..19daa8e7 100644
--- a/content/2014/taste/sort.go
+++ b/content/2014/taste/sort.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/stringer.go b/content/2014/taste/stringer.go
index 06c2dbc9..40a86708 100644
--- a/content/2014/taste/stringer.go
+++ b/content/2014/taste/stringer.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/walk.go b/content/2014/taste/walk.go
index 66dbd8b5..2998af17 100644
--- a/content/2014/taste/walk.go
+++ b/content/2014/taste/walk.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/taste/weekday.go b/content/2014/taste/weekday.go
index d60c2674..d2c39847 100644
--- a/content/2014/taste/weekday.go
+++ b/content/2014/taste/weekday.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/testing/httprecorder.go b/content/2014/testing/httprecorder.go
index 040c0293..10dbd27f 100644
--- a/content/2014/testing/httprecorder.go
+++ b/content/2014/testing/httprecorder.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2014/testing/httpserver.go b/content/2014/testing/httpserver.go
index 0e078c4c..a15aca3d 100644
--- a/content/2014/testing/httpserver.go
+++ b/content/2014/testing/httpserver.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/builtin.go b/content/2015/go-for-java-programmers/builtin.go
index 800a1937..989ad9c0 100644
--- a/content/2015/go-for-java-programmers/builtin.go
+++ b/content/2015/go-for-java-programmers/builtin.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/channel.go b/content/2015/go-for-java-programmers/channel.go
index d1555049..a1ee2e7b 100644
--- a/content/2015/go-for-java-programmers/channel.go
+++ b/content/2015/go-for-java-programmers/channel.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/closure.go b/content/2015/go-for-java-programmers/closure.go
index 5958c1e7..a0daa9cf 100644
--- a/content/2015/go-for-java-programmers/closure.go
+++ b/content/2015/go-for-java-programmers/closure.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/error.go b/content/2015/go-for-java-programmers/error.go
index 92ebe217..5f68e5ec 100644
--- a/content/2015/go-for-java-programmers/error.go
+++ b/content/2015/go-for-java-programmers/error.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/first.go b/content/2015/go-for-java-programmers/first.go
index 590aa7e8..8cca2bac 100644
--- a/content/2015/go-for-java-programmers/first.go
+++ b/content/2015/go-for-java-programmers/first.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/frontend.go b/content/2015/go-for-java-programmers/frontend.go
index 16d744ab..16534450 100644
--- a/content/2015/go-for-java-programmers/frontend.go
+++ b/content/2015/go-for-java-programmers/frontend.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 // The server program issues Google search requests. It serves on port 8080.
 //
diff --git a/content/2015/go-for-java-programmers/func.go b/content/2015/go-for-java-programmers/func.go
index c273fa36..4001d400 100644
--- a/content/2015/go-for-java-programmers/func.go
+++ b/content/2015/go-for-java-programmers/func.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/gofmt-after.go b/content/2015/go-for-java-programmers/gofmt-after.go
index 4d41a578..85a07d01 100644
--- a/content/2015/go-for-java-programmers/gofmt-after.go
+++ b/content/2015/go-for-java-programmers/gofmt-after.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/goimports-after.go b/content/2015/go-for-java-programmers/goimports-after.go
index 398621df..aa8c9f71 100644
--- a/content/2015/go-for-java-programmers/goimports-after.go
+++ b/content/2015/go-for-java-programmers/goimports-after.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/goimports-before.go b/content/2015/go-for-java-programmers/goimports-before.go
index ee9303ac..6744f326 100644
--- a/content/2015/go-for-java-programmers/goimports-before.go
+++ b/content/2015/go-for-java-programmers/goimports-before.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/google-first.go b/content/2015/go-for-java-programmers/google-first.go
index 78f5ac4d..7fd3b968 100644
--- a/content/2015/go-for-java-programmers/google-first.go
+++ b/content/2015/go-for-java-programmers/google-first.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/google-parallel.go b/content/2015/go-for-java-programmers/google-parallel.go
index be3918b0..8de0bc5c 100644
--- a/content/2015/go-for-java-programmers/google-parallel.go
+++ b/content/2015/go-for-java-programmers/google-parallel.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/google-serial.go b/content/2015/go-for-java-programmers/google-serial.go
index f512e663..1573ddd3 100644
--- a/content/2015/go-for-java-programmers/google-serial.go
+++ b/content/2015/go-for-java-programmers/google-serial.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/google-timeout.go b/content/2015/go-for-java-programmers/google-timeout.go
index a891f0f1..1a2c3c7a 100644
--- a/content/2015/go-for-java-programmers/google-timeout.go
+++ b/content/2015/go-for-java-programmers/google-timeout.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/goroutine.go b/content/2015/go-for-java-programmers/goroutine.go
index 9e9dab78..747ea477 100644
--- a/content/2015/go-for-java-programmers/goroutine.go
+++ b/content/2015/go-for-java-programmers/goroutine.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/hello/hello.go b/content/2015/go-for-java-programmers/hello/hello.go
index 1725b6e3..c84b1d7b 100644
--- a/content/2015/go-for-java-programmers/hello/hello.go
+++ b/content/2015/go-for-java-programmers/hello/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/hello/server.go b/content/2015/go-for-java-programmers/hello/server.go
index a9da549d..69bfac1b 100644
--- a/content/2015/go-for-java-programmers/hello/server.go
+++ b/content/2015/go-for-java-programmers/hello/server.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/interface.go b/content/2015/go-for-java-programmers/interface.go
index efef67e3..ca1021a4 100644
--- a/content/2015/go-for-java-programmers/interface.go
+++ b/content/2015/go-for-java-programmers/interface.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/method.go b/content/2015/go-for-java-programmers/method.go
index 230c47f4..15077fa3 100644
--- a/content/2015/go-for-java-programmers/method.go
+++ b/content/2015/go-for-java-programmers/method.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/panic.go b/content/2015/go-for-java-programmers/panic.go
index 6ae78e82..d2c935f1 100644
--- a/content/2015/go-for-java-programmers/panic.go
+++ b/content/2015/go-for-java-programmers/panic.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/pingpipe.go b/content/2015/go-for-java-programmers/pingpipe.go
index df3c5637..e22b851a 100644
--- a/content/2015/go-for-java-programmers/pingpipe.go
+++ b/content/2015/go-for-java-programmers/pingpipe.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/pingpong.go b/content/2015/go-for-java-programmers/pingpong.go
index 4ee3f6b8..2d7664ab 100644
--- a/content/2015/go-for-java-programmers/pingpong.go
+++ b/content/2015/go-for-java-programmers/pingpong.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/pingselect.go b/content/2015/go-for-java-programmers/pingselect.go
index b274e419..03dcb1e9 100644
--- a/content/2015/go-for-java-programmers/pingselect.go
+++ b/content/2015/go-for-java-programmers/pingselect.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/player.go b/content/2015/go-for-java-programmers/player.go
index e66e567f..96df122e 100644
--- a/content/2015/go-for-java-programmers/player.go
+++ b/content/2015/go-for-java-programmers/player.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/pointer.go b/content/2015/go-for-java-programmers/pointer.go
index 05a69afe..eb52944a 100644
--- a/content/2015/go-for-java-programmers/pointer.go
+++ b/content/2015/go-for-java-programmers/pointer.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/safe.go b/content/2015/go-for-java-programmers/safe.go
index 68e11367..234b4d22 100644
--- a/content/2015/go-for-java-programmers/safe.go
+++ b/content/2015/go-for-java-programmers/safe.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go-for-java-programmers/struct.go b/content/2015/go-for-java-programmers/struct.go
index da025c2a..34fa0fa6 100644
--- a/content/2015/go-for-java-programmers/struct.go
+++ b/content/2015/go-for-java-programmers/struct.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/badcounter.go b/content/2015/go4cpp/badcounter.go
index cd201dd8..986d0a7e 100644
--- a/content/2015/go4cpp/badcounter.go
+++ b/content/2015/go4cpp/badcounter.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/battle.go b/content/2015/go4cpp/battle.go
index 8fc95052..fde600c2 100644
--- a/content/2015/go4cpp/battle.go
+++ b/content/2015/go4cpp/battle.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/chan.go b/content/2015/go4cpp/chan.go
index c9ea793e..424fa73c 100644
--- a/content/2015/go4cpp/chan.go
+++ b/content/2015/go4cpp/chan.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/conc1.go b/content/2015/go4cpp/conc1.go
index 9d114bc3..b1a599d4 100644
--- a/content/2015/go4cpp/conc1.go
+++ b/content/2015/go4cpp/conc1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/conc2.go b/content/2015/go4cpp/conc2.go
index 9fc8aa33..129854e3 100644
--- a/content/2015/go4cpp/conc2.go
+++ b/content/2015/go4cpp/conc2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/conc3.go b/content/2015/go4cpp/conc3.go
index ada59d19..1fe09cfe 100644
--- a/content/2015/go4cpp/conc3.go
+++ b/content/2015/go4cpp/conc3.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/defer.go b/content/2015/go4cpp/defer.go
index 11536b85..48b89afd 100644
--- a/content/2015/go4cpp/defer.go
+++ b/content/2015/go4cpp/defer.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/diamond.go b/content/2015/go4cpp/diamond.go
index 665a5f5e..96855fe2 100644
--- a/content/2015/go4cpp/diamond.go
+++ b/content/2015/go4cpp/diamond.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/embedding.go b/content/2015/go4cpp/embedding.go
index f7fae6c3..efb95690 100644
--- a/content/2015/go4cpp/embedding.go
+++ b/content/2015/go4cpp/embedding.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/goodcounter.go b/content/2015/go4cpp/goodcounter.go
index 7ba8b7c5..d2819ad1 100644
--- a/content/2015/go4cpp/goodcounter.go
+++ b/content/2015/go4cpp/goodcounter.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/goroutines.go b/content/2015/go4cpp/goroutines.go
index d137b3ad..cdcdb85f 100644
--- a/content/2015/go4cpp/goroutines.go
+++ b/content/2015/go4cpp/goroutines.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/mock.go b/content/2015/go4cpp/mock.go
index c74d0298..8182226d 100644
--- a/content/2015/go4cpp/mock.go
+++ b/content/2015/go4cpp/mock.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/sizes.go b/content/2015/go4cpp/sizes.go
index 329a1743..b2539217 100644
--- a/content/2015/go4cpp/sizes.go
+++ b/content/2015/go4cpp/sizes.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/go4cpp/webserver.go b/content/2015/go4cpp/webserver.go
index b8cccce4..8d5463cd 100644
--- a/content/2015/go4cpp/webserver.go
+++ b/content/2015/go4cpp/webserver.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/gotham-grpc/backend/backend.go b/content/2015/gotham-grpc/backend/backend.go
index 3ae0f2d0..92ec6ae8 100644
--- a/content/2015/gotham-grpc/backend/backend.go
+++ b/content/2015/gotham-grpc/backend/backend.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 // The backend command runs a Google server that returns fake results.
 package main
diff --git a/content/2015/gotham-grpc/client/client.go b/content/2015/gotham-grpc/client/client.go
index fd3aa620..2dbb8968 100644
--- a/content/2015/gotham-grpc/client/client.go
+++ b/content/2015/gotham-grpc/client/client.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 // The client command issues RPCs to a Google server and prints the
 // results.
diff --git a/content/2015/gotham-grpc/frontend/frontend.go b/content/2015/gotham-grpc/frontend/frontend.go
index 1d6c1fb3..35b54809 100644
--- a/content/2015/gotham-grpc/frontend/frontend.go
+++ b/content/2015/gotham-grpc/frontend/frontend.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 // The frontend command runs a Google server that combines results
 // from multiple backends.
diff --git a/content/2015/gotham-grpc/search-only/search-only.pb.go b/content/2015/gotham-grpc/search-only/search-only.pb.go
index 83a5bf5a..5112a2d7 100644
--- a/content/2015/gotham-grpc/search-only/search-only.pb.go
+++ b/content/2015/gotham-grpc/search-only/search-only.pb.go
@@ -2,7 +2,7 @@
 // source: search-only.proto
 // DO NOT EDIT!
 
-// +build OMIT
+// +build ignore,OMIT
 
 /*
 Package search_only is a generated protocol buffer package.
diff --git a/content/2015/gotham-grpc/search/search.pb.go b/content/2015/gotham-grpc/search/search.pb.go
index 0fa9b393..f123fa06 100644
--- a/content/2015/gotham-grpc/search/search.pb.go
+++ b/content/2015/gotham-grpc/search/search.pb.go
@@ -2,7 +2,7 @@
 // source: search.proto
 // DO NOT EDIT!
 
-// +build OMIT
+// +build ignore,OMIT
 
 /*
 Package search is a generated protocol buffer package.
diff --git a/content/2015/json/dates.go b/content/2015/json/dates.go
index 2bac211f..60fce9b9 100644
--- a/content/2015/json/dates.go
+++ b/content/2015/json/dates.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/json/roman_numerals.go b/content/2015/json/roman_numerals.go
index 2eb9cd6d..2a5f0062 100644
--- a/content/2015/json/roman_numerals.go
+++ b/content/2015/json/roman_numerals.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/json/secret.go b/content/2015/json/secret.go
index 0c6c6ecb..60e72d46 100644
--- a/content/2015/json/secret.go
+++ b/content/2015/json/secret.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/json/unmarshaler0.go b/content/2015/json/unmarshaler0.go
index 844da802..1206f8fc 100644
--- a/content/2015/json/unmarshaler0.go
+++ b/content/2015/json/unmarshaler0.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/json/unmarshaler0bad.go b/content/2015/json/unmarshaler0bad.go
index 0636f745..f36d176a 100644
--- a/content/2015/json/unmarshaler0bad.go
+++ b/content/2015/json/unmarshaler0bad.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/json/unmarshaler0map.go b/content/2015/json/unmarshaler0map.go
index 69ebd4e3..c8af3b6a 100644
--- a/content/2015/json/unmarshaler0map.go
+++ b/content/2015/json/unmarshaler0map.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/json/unmarshaler1.go b/content/2015/json/unmarshaler1.go
index de5c46ca..cb9f63a1 100644
--- a/content/2015/json/unmarshaler1.go
+++ b/content/2015/json/unmarshaler1.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/json/unmarshaler2.go b/content/2015/json/unmarshaler2.go
index d61b67c6..c7e8a455 100644
--- a/content/2015/json/unmarshaler2.go
+++ b/content/2015/json/unmarshaler2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/json/unmarshaler3.go b/content/2015/json/unmarshaler3.go
index e3f2aa52..9a95d409 100644
--- a/content/2015/json/unmarshaler3.go
+++ b/content/2015/json/unmarshaler3.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/json/unmarshaler4.go b/content/2015/json/unmarshaler4.go
index 52cdddd6..0f126a96 100644
--- a/content/2015/json/unmarshaler4.go
+++ b/content/2015/json/unmarshaler4.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/simplicity-is-complicated/hello.go b/content/2015/simplicity-is-complicated/hello.go
index b64596ef..3d0e80c4 100644
--- a/content/2015/simplicity-is-complicated/hello.go
+++ b/content/2015/simplicity-is-complicated/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2015/simplicity-is-complicated/shift.go b/content/2015/simplicity-is-complicated/shift.go
index 95832de2..fe93b01b 100644
--- a/content/2015/simplicity-is-complicated/shift.go
+++ b/content/2015/simplicity-is-complicated/shift.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/builtin.go b/content/2016/applicative/builtin.go
index 800a1937..989ad9c0 100644
--- a/content/2016/applicative/builtin.go
+++ b/content/2016/applicative/builtin.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/channel.go b/content/2016/applicative/channel.go
index d1555049..a1ee2e7b 100644
--- a/content/2016/applicative/channel.go
+++ b/content/2016/applicative/channel.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/closure.go b/content/2016/applicative/closure.go
index 5958c1e7..a0daa9cf 100644
--- a/content/2016/applicative/closure.go
+++ b/content/2016/applicative/closure.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/error.go b/content/2016/applicative/error.go
index 92ebe217..5f68e5ec 100644
--- a/content/2016/applicative/error.go
+++ b/content/2016/applicative/error.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/first.go b/content/2016/applicative/first.go
index 07ee445d..cffd44cb 100644
--- a/content/2016/applicative/first.go
+++ b/content/2016/applicative/first.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/frontend.go b/content/2016/applicative/frontend.go
index 2baae768..45f9f963 100644
--- a/content/2016/applicative/frontend.go
+++ b/content/2016/applicative/frontend.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 // The server program issues Google search requests. It serves on port 8080.
 //
diff --git a/content/2016/applicative/func.go b/content/2016/applicative/func.go
index c273fa36..4001d400 100644
--- a/content/2016/applicative/func.go
+++ b/content/2016/applicative/func.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/gofmt-after.go b/content/2016/applicative/gofmt-after.go
index 4d41a578..85a07d01 100644
--- a/content/2016/applicative/gofmt-after.go
+++ b/content/2016/applicative/gofmt-after.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/goimports-after.go b/content/2016/applicative/goimports-after.go
index 398621df..aa8c9f71 100644
--- a/content/2016/applicative/goimports-after.go
+++ b/content/2016/applicative/goimports-after.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/goimports-before.go b/content/2016/applicative/goimports-before.go
index ee9303ac..6744f326 100644
--- a/content/2016/applicative/goimports-before.go
+++ b/content/2016/applicative/goimports-before.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/goroutine.go b/content/2016/applicative/goroutine.go
index 9e9dab78..747ea477 100644
--- a/content/2016/applicative/goroutine.go
+++ b/content/2016/applicative/goroutine.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/hello/hello.go b/content/2016/applicative/hello/hello.go
index 1725b6e3..c84b1d7b 100644
--- a/content/2016/applicative/hello/hello.go
+++ b/content/2016/applicative/hello/hello.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/hello/server.go b/content/2016/applicative/hello/server.go
index a9da549d..69bfac1b 100644
--- a/content/2016/applicative/hello/server.go
+++ b/content/2016/applicative/hello/server.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/interface.go b/content/2016/applicative/interface.go
index efef67e3..ca1021a4 100644
--- a/content/2016/applicative/interface.go
+++ b/content/2016/applicative/interface.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/method.go b/content/2016/applicative/method.go
index 230c47f4..15077fa3 100644
--- a/content/2016/applicative/method.go
+++ b/content/2016/applicative/method.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/panic.go b/content/2016/applicative/panic.go
index 6ae78e82..d2c935f1 100644
--- a/content/2016/applicative/panic.go
+++ b/content/2016/applicative/panic.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/pingpipe.go b/content/2016/applicative/pingpipe.go
index df3c5637..e22b851a 100644
--- a/content/2016/applicative/pingpipe.go
+++ b/content/2016/applicative/pingpipe.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/pingpong.go b/content/2016/applicative/pingpong.go
index 4ee3f6b8..2d7664ab 100644
--- a/content/2016/applicative/pingpong.go
+++ b/content/2016/applicative/pingpong.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/pingselect.go b/content/2016/applicative/pingselect.go
index b274e419..03dcb1e9 100644
--- a/content/2016/applicative/pingselect.go
+++ b/content/2016/applicative/pingselect.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/player.go b/content/2016/applicative/player.go
index e66e567f..96df122e 100644
--- a/content/2016/applicative/player.go
+++ b/content/2016/applicative/player.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/pointer.go b/content/2016/applicative/pointer.go
index 05a69afe..eb52944a 100644
--- a/content/2016/applicative/pointer.go
+++ b/content/2016/applicative/pointer.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/safe.go b/content/2016/applicative/safe.go
index 68e11367..234b4d22 100644
--- a/content/2016/applicative/safe.go
+++ b/content/2016/applicative/safe.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/applicative/struct.go b/content/2016/applicative/struct.go
index da025c2a..34fa0fa6 100644
--- a/content/2016/applicative/struct.go
+++ b/content/2016/applicative/struct.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/cgo/main.go b/content/2016/state-of-go/cgo/main.go
index 1d83eb22..6660eb7a 100644
--- a/content/2016/state-of-go/cgo/main.go
+++ b/content/2016/state-of-go/cgo/main.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/govet/main.go b/content/2016/state-of-go/govet/main.go
index 4f361bdf..d4f49a21 100644
--- a/content/2016/state-of-go/govet/main.go
+++ b/content/2016/state-of-go/govet/main.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/runtime/crash.go b/content/2016/state-of-go/runtime/crash.go
index 7a28524d..d65fb5e8 100644
--- a/content/2016/state-of-go/runtime/crash.go
+++ b/content/2016/state-of-go/runtime/crash.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/runtime/good/good.go b/content/2016/state-of-go/runtime/good/good.go
index 830cc8eb..677c3a5b 100644
--- a/content/2016/state-of-go/runtime/good/good.go
+++ b/content/2016/state-of-go/runtime/good/good.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/sort/stable.go b/content/2016/state-of-go/sort/stable.go
index 74041a9e..ac8e5c25 100644
--- a/content/2016/state-of-go/sort/stable.go
+++ b/content/2016/state-of-go/sort/stable.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/sort/unstable.go b/content/2016/state-of-go/sort/unstable.go
index 3923a2ce..fa440f38 100644
--- a/content/2016/state-of-go/sort/unstable.go
+++ b/content/2016/state-of-go/sort/unstable.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/template/blocks.go b/content/2016/state-of-go/template/blocks.go
index c549ee6f..17fadd49 100644
--- a/content/2016/state-of-go/template/blocks.go
+++ b/content/2016/state-of-go/template/blocks.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/template/define.go b/content/2016/state-of-go/template/define.go
index 046f493c..cd4986aa 100644
--- a/content/2016/state-of-go/template/define.go
+++ b/content/2016/state-of-go/template/define.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/template/fixed.go b/content/2016/state-of-go/template/fixed.go
index ddda3563..4a4dcb0c 100644
--- a/content/2016/state-of-go/template/fixed.go
+++ b/content/2016/state-of-go/template/fixed.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/template/new.go b/content/2016/state-of-go/template/new.go
index fc5d5452..eb8f7b11 100644
--- a/content/2016/state-of-go/template/new.go
+++ b/content/2016/state-of-go/template/new.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/template/old.go b/content/2016/state-of-go/template/old.go
index f5156c40..0bae7882 100644
--- a/content/2016/state-of-go/template/old.go
+++ b/content/2016/state-of-go/template/old.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/template/redefine.go b/content/2016/state-of-go/template/redefine.go
index 264768c5..b4b736d5 100644
--- a/content/2016/state-of-go/template/redefine.go
+++ b/content/2016/state-of-go/template/redefine.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2016/state-of-go/time/time.go b/content/2016/state-of-go/time/time.go
index a94d2180..564c0628 100644
--- a/content/2016/state-of-go/time/time.go
+++ b/content/2016/state-of-go/time/time.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/runtime/mapcrash.go b/content/2017/state-of-go/runtime/mapcrash.go
index 7a28524d..d65fb5e8 100644
--- a/content/2017/state-of-go/runtime/mapcrash.go
+++ b/content/2017/state-of-go/runtime/mapcrash.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/runtime/mutex/main.go b/content/2017/state-of-go/runtime/mutex/main.go
index 561a911b..f5a1179b 100644
--- a/content/2017/state-of-go/runtime/mutex/main.go
+++ b/content/2017/state-of-go/runtime/mutex/main.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/runtime/mutex/main_test.go b/content/2017/state-of-go/runtime/mutex/main_test.go
index 2bbb3ce0..a4993c2f 100644
--- a/content/2017/state-of-go/runtime/mutex/main_test.go
+++ b/content/2017/state-of-go/runtime/mutex/main_test.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/stdlib/http2/http2.go b/content/2017/state-of-go/stdlib/http2/http2.go
index 3c6406d7..29a40f53 100644
--- a/content/2017/state-of-go/stdlib/http2/http2.go
+++ b/content/2017/state-of-go/stdlib/http2/http2.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/stdlib/json_old.go b/content/2017/state-of-go/stdlib/json_old.go
index 2f4ceab7..8ad0b975 100644
--- a/content/2017/state-of-go/stdlib/json_old.go
+++ b/content/2017/state-of-go/stdlib/json_old.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/stdlib/plugin/main.go b/content/2017/state-of-go/stdlib/plugin/main.go
index 7b362306..925de055 100644
--- a/content/2017/state-of-go/stdlib/plugin/main.go
+++ b/content/2017/state-of-go/stdlib/plugin/main.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/stdlib/plugin/plugin.go b/content/2017/state-of-go/stdlib/plugin/plugin.go
index e7c29c38..0fbe41ce 100644
--- a/content/2017/state-of-go/stdlib/plugin/plugin.go
+++ b/content/2017/state-of-go/stdlib/plugin/plugin.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/stdlib/shutdown.go b/content/2017/state-of-go/stdlib/shutdown.go
index fa799a92..c35f9f74 100644
--- a/content/2017/state-of-go/stdlib/shutdown.go
+++ b/content/2017/state-of-go/stdlib/shutdown.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/tools/gofix.go b/content/2017/state-of-go/tools/gofix.go
index d3640eac..1c83ded7 100644
--- a/content/2017/state-of-go/tools/gofix.go
+++ b/content/2017/state-of-go/tools/gofix.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/content/2017/state-of-go/tools/govet.go b/content/2017/state-of-go/tools/govet.go
index d41d5379..f1eced14 100644
--- a/content/2017/state-of-go/tools/govet.go
+++ b/content/2017/state-of-go/tools/govet.go
@@ -1,4 +1,4 @@
-// +build OMIT
+// +build ignore,OMIT
 
 package main
 
diff --git a/go.mod b/go.mod
new file mode 100644
index 00000000..63a51b92
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module golang.org/x/talks
+
+go 1.11