diff --git a/content/2010/io/balance.go b/content/2010/io/balance.go
index 4ecac02..8388cfd 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 4173fb6..5c30fe2 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 f2229d9..c942fe5 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 c5f6237..eef7741 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 e80aff0..d138a51 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 7940a82..986cb87 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 6baca78..9be9a4d 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 61daba0..ce6791f 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 98a43b2..577b016 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 b7f2185..d712b91 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 6972c2c..090e80d 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 105a4e2..97dfe41 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 1306652..095934a 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 d4f7f35..b4e1fdc 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 ae37e12..031a518 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 d4f7f35..b4e1fdc 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 5641189..5654f3c 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 d4f7f35..b4e1fdc 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 105a4e2..97dfe41 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 a21f740..fa27d24 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 4ccc563..1da4ee4 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 5058efb..a6aa2d7 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 db16657..37dce1e 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 b61cb8f..fdecb21 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 d039d25..b86d97b 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 d4fee8b..298e5c7 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 32f3082..020fb48 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 5bfef31..0757c53 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 db1ade8..b236f41 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 3e1c469..5b056ca 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 57ce08f..9333691 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 a9093fb..c07fa27 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 2ce8aac..b049ee0 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 38f2d33..f534359 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 141c85c..200451a 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 de4889c..0f39812 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 f856f9f..08b3d80 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 57adc77..45be6f8 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 8a400cc..eeae3ca 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 d5363ec..e28b6a3 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 93ca848..10089d3 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 0ed5eaf..53be753 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 0031b88..2dac79f 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 7d590ac..9382430 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 8e50e3c..4188fcd 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 7a1b15a..a10c9cb 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 d30ef4f..5549d51 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 af90c8e..31f1c1e 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 cc16ca0..9e16caf 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 e13a800..855332e 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 14ed7ac..aa707af 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 c100828..78cb5c7 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 40caf0c..1117466 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 9673a1b..7d8cab9 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 97a1c01..5dd4a89 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 cd5a7d6..3fb1fb8 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 f856f9f..08b3d80 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 df4f4b3..1ebc71a 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 dc17c41..3979df1 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 34beb44..ffb4572 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 7a1b15a..a10c9cb 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 d1eb843..4825227 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 b2daa2b..20c815b 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 e120eb5..33cf221 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 219fbbe..b49dd4f 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 41c8b48..fa1d0f7 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 7f9158f..ced6d0e 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 6ea2de1..3b8504f 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 965bfa2..12975c4 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 b480451..e4f48ab 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 ab7c755..02bc0f6 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 31eb9ff..2973d77 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 06768d4..ae6a5c7 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 961558c..101eaa7 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 d60a02d..585af16 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 568eff4..f995e9b 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 66ba0c6..b62da0a 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 6bd22f5..20d5dde 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 ab2e490..f53fa2a 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 3e1c469..5b056ca 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 8abdf35..2606af3 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 606dcef..05d1439 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 5bfef31..0757c53 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 10befcc..d0d975a 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 ea38c1c..aa91a92 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 32ed052..1aa4415 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 0a64c0e..1e67361 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 f943c50..a65ff9d 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 e4f33b9..c73963f 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 f13ba87..bd7273c 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 76c998f..d0e1ba3 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 6034992..bf28dec 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 a153ec2..5fe9a78 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 0d692b7..98b914b 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 1a9b881..0e0bf8f 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 34cf673..afc8a64 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 7b616a7..2cef862 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 9291c21..0f04e20 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 a0d1b73..d513197 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 f6e12b7..10fcad6 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 c5a22eb..3848398 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 c5840e4..e97976e 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 645295a..04c77b1 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 717d77d..f3b25f7 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 4672010..fdffcde 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 f4063a0..99ba553 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 ca9bdc1..9f6937c 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 fc1f422..a426c15 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 f347e86..049a71d 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 3f8387f..ec3c5ad 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 3a9ff71..a752580 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 159d2c5..fd350b4 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 159d2c5..fd350b4 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 9764237..d5edff1 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 cd0a9e6..562b73b 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 6be5499..7813f86 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 cfcbc74..d615a87 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 4971dbe..25ed0ae 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 47eca96..7e77b5b 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 a026463..0c20ceb 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 e9234bf..b755b52 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 0c6a79c..596224c 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 7ff3986..e8cea40 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 9a307ef..272e539 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 9c1c293..4dfc090 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 fb7bdb4..76e4665 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 4287499..38b9e22 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 de305fc..a9677c0 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 6e52b38..32efb51 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 55a2c1b..270d531 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 31475f2..b423278 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 911ba50..8c301fe 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 3d48603..c7fa03c 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 8ac1c7a..94d75c4 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 3dba109..5977c7f 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 a2346d6..9c149bd 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 17e0c2d..cec0ef3 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 adaeee1..11bebb1 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 c358925..1515088 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 cdfedd0..d06ec33 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 6846f97..52932d2 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 64a3b06..7ff23d6 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 d7d02bc..112f7bc 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 784cf19..c03b25c 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 168850a..f9f0463 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 0149ad3..2096bc9 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 00d8ae2..45eaf42 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 de5c94a..2388034 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 61a0b27..300ea73 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 5400825..a896970 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 3b5bd79..5e80e25 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 77ad544..3323b42 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 29d189e..30521f8 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 f3df3c2..f185152 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 2c0547f..b014ecc 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 9ee48a6..661a153 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 1b46509..f6caa71 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 dfcd61d..1a5bc36 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 fa7d5da..6690b4d 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 efb4896..c097d6c 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 19faba8..51d39c5 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 f478c9f..6c10c59 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 e176802..49c341a 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 a73a868..f1bde43 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 209a035..60c1092 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 acd9fe3..50c13e4 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 98ced84..3a0b116 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 a548d61..fa13028 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 48d7fde..35b5c27 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 04b188e..3b5c199 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 4082d93..de8cad5 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 32162c5..3895044 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 5a06f3e..c43c0e7 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 8fc9505..fde600c 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 c9ea793..424fa73 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 9d114bc..b1a599d 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 9fc8aa3..129854e 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 ada59d1..1fe09cf 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 d14a75c..48cc267 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 510bfaf..e839a94 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 d137b3a..cdcdb85 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 63e8b93..8f7646b 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 379ca0b..e100140 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 c86662c..dbec869 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 79a1efa..1da89ef 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 c314f4d..7f9e9fb 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 dde0ffa..774d881 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 47bee60..e267a81 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 a203450..51450c5 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 110f14a..b00a0cf 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 0737130..7091c1d 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 2ff641a..9726526 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 cf0cd32..0444e7d 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 83cd104..c8fd303 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 b24f378..c1248a0 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 18c6e39..24f32b0 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 7b40099..26005a9 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 eb8b759..eebdc46 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 5121ca7..def5665 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 27c53d5..de69f3a 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 a38d597..6d6e271 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 f3cd8dd..e275d1d 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 d2a0a0e..0f884f6 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 32b0dc9..b00b638 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 362395a..530e9b4 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 563a9a4..8de9497 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 a5859ce..8a227ab 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 021481a..b640203 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 fd34e25..b68c5ff 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 ba50efa..b6686f8 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 c0f862f..c5a2a71 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 cad9f22..a033a00 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 e6f99fb..e0f9874 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 64abe17..cc20864 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 375de27..c96f4c3 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 93c8970..697ba95 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 b2e13fc..0ae4590 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 47ae9b3..cc8cb5e 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 af53f63..324327a 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 a13a7e5..0baec8b 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 376445f..1b91da9 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 352e39c..0ad26b7 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 b3bde3b..8969e88 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 f7f11f6..adbc01a 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 ad762b5..55a6d92 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 69d62bb..2f26b35 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 c274484..d5c790a 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 319cb66..c3afe11 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 eb71c88..9774716 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 4e70184..6312e09 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 c872eef..afa1d5e 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 90c87f1..e78f819 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 82aa9c3..a185385 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 22ed8a3..6af1e5d 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 d3106d7..ae6aeb7 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 7ff3986..e8cea40 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 4f9078f..3475997 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 6e52b38..32efb51 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 af7bd2c..fff9e7a 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 930231b..e0c9462 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 b480451..e4f48ab 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 203c2a3..7c16792 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 973a8c0..f0c456f 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 6c05452..cc496c1 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 4e462c5..e353e4c 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 1725b6e..c84b1d7 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 27b6d38..acf6a4c 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 b7451e6..2c321ed 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 ecedfd3..6f59e1e 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 bf54046..767b6d5 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 5b2f5b5..248730d 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 320e4b8..19daa8e 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 06c2dbc..40a8670 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 66dbd8b..2998af1 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 d60c267..d2c3984 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 040c029..10dbd27 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 0e078c4..a15aca3 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 800a193..989ad9c 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 d155504..a1ee2e7 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 5958c1e..a0daa9c 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 92ebe21..5f68e5e 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 590aa7e..8cca2ba 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 16d744a..1653445 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 c273fa3..4001d40 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 4d41a57..85a07d0 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 398621d..aa8c9f7 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 ee9303a..6744f32 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 78f5ac4..7fd3b96 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 be3918b..8de0bc5 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 f512e66..1573ddd 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 a891f0f..1a2c3c7 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 9e9dab7..747ea47 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 1725b6e..c84b1d7 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 a9da549..69bfac1 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 efef67e..ca1021a 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 230c47f..15077fa 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 6ae78e8..d2c935f 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 df3c563..e22b851 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 4ee3f6b..2d7664a 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 b274e41..03dcb1e 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 e66e567..96df122 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 05a69af..eb52944 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 68e1136..234b4d2 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 da025c2..34fa0fa 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 cd201dd..986d0a7 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 8fc9505..fde600c 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 c9ea793..424fa73 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 9d114bc..b1a599d 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 9fc8aa3..129854e 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 ada59d1..1fe09cf 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 11536b8..48b89af 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 665a5f5..96855fe 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 f7fae6c..efb9569 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 7ba8b7c..d2819ad 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 d137b3a..cdcdb85 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 c74d029..8182226 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 329a174..b253921 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 b8cccce..8d5463c 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 3ae0f2d..92ec6ae 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 fd3aa62..2dbb896 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 1d6c1fb..35b5480 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 83a5bf5..5112a2d 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 0fa9b39..f123fa0 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 2bac211..60fce9b 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 2eb9cd6..2a5f006 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 0c6c6ec..60e72d4 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 844da80..1206f8f 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 0636f74..f36d176 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 69ebd4e..c8af3b6 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 de5c46c..cb9f63a 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 d61b67c..c7e8a45 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 e3f2aa5..9a95d40 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 52cdddd..0f126a9 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 b64596e..3d0e80c 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 95832de..fe93b01 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 800a193..989ad9c 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 d155504..a1ee2e7 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 5958c1e..a0daa9c 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 92ebe21..5f68e5e 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 07ee445..cffd44c 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 2baae76..45f9f96 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 c273fa3..4001d40 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 4d41a57..85a07d0 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 398621d..aa8c9f7 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 ee9303a..6744f32 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 9e9dab7..747ea47 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 1725b6e..c84b1d7 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 a9da549..69bfac1 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 efef67e..ca1021a 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 230c47f..15077fa 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 6ae78e8..d2c935f 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 df3c563..e22b851 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 4ee3f6b..2d7664a 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 b274e41..03dcb1e 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 e66e567..96df122 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 05a69af..eb52944 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 68e1136..234b4d2 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 da025c2..34fa0fa 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 1d83eb2..6660eb7 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 4f361bd..d4f49a2 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 7a28524..d65fb5e 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 830cc8e..677c3a5 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 74041a9..ac8e5c2 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 3923a2c..fa440f3 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 c549ee6..17fadd4 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 046f493..cd4986a 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 ddda356..4a4dcb0 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 fc5d545..eb8f7b1 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 f5156c4..0bae788 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 264768c..b4b736d 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 a94d218..564c062 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 7a28524..d65fb5e 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 561a911..f5a1179 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 2bbb3ce..a4993c2 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 3c6406d..29a40f5 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 2f4ceab..8ad0b97 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 7b36230..925de05 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 e7c29c3..0fbe41c 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 fa799a9..c35f9f7 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 d3640ea..1c83ded 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 d41d537..f1eced1 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 0000000..63a51b9
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module golang.org/x/talks
+
+go 1.11