diff --git a/activedata_etl/__init__.py b/activedata_etl/__init__.py
index d0cda109..677d39f4 100644
--- a/activedata_etl/__init__.py
+++ b/activedata_etl/__init__.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/auto_backfill.py b/activedata_etl/auto_backfill.py
index e93829ad..a9d50ba2 100644
--- a/activedata_etl/auto_backfill.py
+++ b/activedata_etl/auto_backfill.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/backfill.py b/activedata_etl/backfill.py
index ecd41e5c..efd1c216 100644
--- a/activedata_etl/backfill.py
+++ b/activedata_etl/backfill.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/backfill_repo.py b/activedata_etl/backfill_repo.py
index a9d8c95c..d358f56e 100644
--- a/activedata_etl/backfill_repo.py
+++ b/activedata_etl/backfill_repo.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/buildbot_json_logs.py b/activedata_etl/buildbot_json_logs.py
index 600e4ab9..0aa5c4e3 100644
--- a/activedata_etl/buildbot_json_logs.py
+++ b/activedata_etl/buildbot_json_logs.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/compact_tc_logger.py b/activedata_etl/compact_tc_logger.py
index a5cf450e..801ab2b4 100644
--- a/activedata_etl/compact_tc_logger.py
+++ b/activedata_etl/compact_tc_logger.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/copy_queue.py b/activedata_etl/copy_queue.py
index 72575e14..440d7d68 100644
--- a/activedata_etl/copy_queue.py
+++ b/activedata_etl/copy_queue.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 
diff --git a/activedata_etl/etl.py b/activedata_etl/etl.py
index 578ebcaf..d91fa247 100644
--- a/activedata_etl/etl.py
+++ b/activedata_etl/etl.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/find_es_oom.py b/activedata_etl/find_es_oom.py
index c46d3405..0013f589 100644
--- a/activedata_etl/find_es_oom.py
+++ b/activedata_etl/find_es_oom.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/fx_test_logger.py b/activedata_etl/fx_test_logger.py
index 7ef01799..ec0da0b3 100644
--- a/activedata_etl/fx_test_logger.py
+++ b/activedata_etl/fx_test_logger.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/get_tuid.py b/activedata_etl/get_tuid.py
index efc05e00..5dea4941 100644
--- a/activedata_etl/get_tuid.py
+++ b/activedata_etl/get_tuid.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/imports/buildbot.py b/activedata_etl/imports/buildbot.py
index 69eb0bc6..dadcb8da 100644
--- a/activedata_etl/imports/buildbot.py
+++ b/activedata_etl/imports/buildbot.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 from __future__ import division
diff --git a/activedata_etl/imports/coverage_util.py b/activedata_etl/imports/coverage_util.py
index 13a4a197..0ee9ec41 100644
--- a/activedata_etl/imports/coverage_util.py
+++ b/activedata_etl/imports/coverage_util.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (klahnakoski@mozilla.com)
+# Contact: Kyle Lahnakoski (klahnakoski@mozilla.com)
 
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/imports/file_mapper.py b/activedata_etl/imports/file_mapper.py
index 5b5b4f60..f96e4cec 100644
--- a/activedata_etl/imports/file_mapper.py
+++ b/activedata_etl/imports/file_mapper.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (klahnakoski@mozilla.com)
+# Contact: Kyle Lahnakoski (klahnakoski@mozilla.com)
 
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/imports/resource_usage.py b/activedata_etl/imports/resource_usage.py
index a8b6cdd6..c5caf4b6 100644
--- a/activedata_etl/imports/resource_usage.py
+++ b/activedata_etl/imports/resource_usage.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 from __future__ import division
diff --git a/activedata_etl/look_at_queue.py b/activedata_etl/look_at_queue.py
index d98ccf10..529e612a 100644
--- a/activedata_etl/look_at_queue.py
+++ b/activedata_etl/look_at_queue.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 
diff --git a/activedata_etl/monitor/es.py b/activedata_etl/monitor/es.py
index 44c21b03..9ad7e05f 100644
--- a/activedata_etl/monitor/es.py
+++ b/activedata_etl/monitor/es.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/monitor/etl.py b/activedata_etl/monitor/etl.py
index ed67314f..eac3de03 100644
--- a/activedata_etl/monitor/etl.py
+++ b/activedata_etl/monitor/etl.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/pulse_logger.py b/activedata_etl/pulse_logger.py
index 63e09250..5d77f414 100644
--- a/activedata_etl/pulse_logger.py
+++ b/activedata_etl/pulse_logger.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/push_to_es.py b/activedata_etl/push_to_es.py
index afcdf582..cf897a67 100644
--- a/activedata_etl/push_to_es.py
+++ b/activedata_etl/push_to_es.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/push_to_es_start.py b/activedata_etl/push_to_es_start.py
index 106170fa..6cbb1637 100644
--- a/activedata_etl/push_to_es_start.py
+++ b/activedata_etl/push_to_es_start.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/push_to_es_stop.py b/activedata_etl/push_to_es_stop.py
index 51d3f879..835ecf9f 100644
--- a/activedata_etl/push_to_es_stop.py
+++ b/activedata_etl/push_to_es_stop.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/s3_clear.py b/activedata_etl/s3_clear.py
index 23ef9685..7acd7981 100644
--- a/activedata_etl/s3_clear.py
+++ b/activedata_etl/s3_clear.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/s3_clear_bucket.py b/activedata_etl/s3_clear_bucket.py
index cf75e0d3..676824d7 100644
--- a/activedata_etl/s3_clear_bucket.py
+++ b/activedata_etl/s3_clear_bucket.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/s3_find.py b/activedata_etl/s3_find.py
index 7b3d63d8..669e363a 100644
--- a/activedata_etl/s3_find.py
+++ b/activedata_etl/s3_find.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/s3_look.py b/activedata_etl/s3_look.py
index 33425150..72daa175 100644
--- a/activedata_etl/s3_look.py
+++ b/activedata_etl/s3_look.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 
diff --git a/activedata_etl/s3_make_public.py b/activedata_etl/s3_make_public.py
index fffa2b6f..3f3e5c01 100644
--- a/activedata_etl/s3_make_public.py
+++ b/activedata_etl/s3_make_public.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/sinks/dummy_sink.py b/activedata_etl/sinks/dummy_sink.py
index 9e8721c0..45a3c68e 100644
--- a/activedata_etl/sinks/dummy_sink.py
+++ b/activedata_etl/sinks/dummy_sink.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/sinks/s3_bucket.py b/activedata_etl/sinks/s3_bucket.py
index 27add928..1a8a1005 100644
--- a/activedata_etl/sinks/s3_bucket.py
+++ b/activedata_etl/sinks/s3_bucket.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/sinks/split.py b/activedata_etl/sinks/split.py
index 0f436da7..2bc56dd6 100644
--- a/activedata_etl/sinks/split.py
+++ b/activedata_etl/sinks/split.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/sinks/threaded.py b/activedata_etl/sinks/threaded.py
index fc129ad8..bf13a0ba 100644
--- a/activedata_etl/sinks/threaded.py
+++ b/activedata_etl/sinks/threaded.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/transforms/__init__.py b/activedata_etl/transforms/__init__.py
index c1dc3ea7..fd06ca65 100644
--- a/activedata_etl/transforms/__init__.py
+++ b/activedata_etl/transforms/__init__.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/buildbot_block_to_job_logs.py b/activedata_etl/transforms/buildbot_block_to_job_logs.py
index f40fadf1..c8396a83 100644
--- a/activedata_etl/transforms/buildbot_block_to_job_logs.py
+++ b/activedata_etl/transforms/buildbot_block_to_job_logs.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/transforms/fx_test_to_normalized.py b/activedata_etl/transforms/fx_test_to_normalized.py
index e339d927..bef9a026 100644
--- a/activedata_etl/transforms/fx_test_to_normalized.py
+++ b/activedata_etl/transforms/fx_test_to_normalized.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/grcov_to_es.py b/activedata_etl/transforms/grcov_to_es.py
index 9fef797a..b712bc6e 100644
--- a/activedata_etl/transforms/grcov_to_es.py
+++ b/activedata_etl/transforms/grcov_to_es.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (klahnakoski@mozilla.com)
+# Contact: Kyle Lahnakoski (klahnakoski@mozilla.com)
 
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/jsvm_to_es.py b/activedata_etl/transforms/jsvm_to_es.py
index 979d5ea1..80a36a5f 100644
--- a/activedata_etl/transforms/jsvm_to_es.py
+++ b/activedata_etl/transforms/jsvm_to_es.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (klahnakoski@mozilla.com)
+# Contact: Kyle Lahnakoski (klahnakoski@mozilla.com)
 
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/perfherder_logs_to_perf_logs.py b/activedata_etl/transforms/perfherder_logs_to_perf_logs.py
index dbeb311f..bd543eea 100644
--- a/activedata_etl/transforms/perfherder_logs_to_perf_logs.py
+++ b/activedata_etl/transforms/perfherder_logs_to_perf_logs.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 from __future__ import division
diff --git a/activedata_etl/transforms/pulse_block_to_es.py b/activedata_etl/transforms/pulse_block_to_es.py
index 96dc9f7a..a11c48bf 100644
--- a/activedata_etl/transforms/pulse_block_to_es.py
+++ b/activedata_etl/transforms/pulse_block_to_es.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/pulse_block_to_job_logs.py b/activedata_etl/transforms/pulse_block_to_job_logs.py
index b1df7f0a..969b0bc2 100644
--- a/activedata_etl/transforms/pulse_block_to_job_logs.py
+++ b/activedata_etl/transforms/pulse_block_to_job_logs.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/transforms/pulse_block_to_perfherder_logs.py b/activedata_etl/transforms/pulse_block_to_perfherder_logs.py
index c5c9373e..c1c90498 100644
--- a/activedata_etl/transforms/pulse_block_to_perfherder_logs.py
+++ b/activedata_etl/transforms/pulse_block_to_perfherder_logs.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/transforms/pulse_block_to_task_cluster.py b/activedata_etl/transforms/pulse_block_to_task_cluster.py
index f658b8f4..bc7ce854 100644
--- a/activedata_etl/transforms/pulse_block_to_task_cluster.py
+++ b/activedata_etl/transforms/pulse_block_to_task_cluster.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/pulse_block_to_test_result_logs.py b/activedata_etl/transforms/pulse_block_to_test_result_logs.py
index 3485cadf..41ea5559 100644
--- a/activedata_etl/transforms/pulse_block_to_test_result_logs.py
+++ b/activedata_etl/transforms/pulse_block_to_test_result_logs.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/task_cluster_to_firefox_files.py b/activedata_etl/transforms/task_cluster_to_firefox_files.py
index 20dd9147..c94cb529 100644
--- a/activedata_etl/transforms/task_cluster_to_firefox_files.py
+++ b/activedata_etl/transforms/task_cluster_to_firefox_files.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/task_cluster_to_perfherder.py b/activedata_etl/transforms/task_cluster_to_perfherder.py
index 4ec8a8a2..84a5a3a8 100644
--- a/activedata_etl/transforms/task_cluster_to_perfherder.py
+++ b/activedata_etl/transforms/task_cluster_to_perfherder.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/activedata_etl/transforms/task_cluster_to_test_result.py b/activedata_etl/transforms/task_cluster_to_test_result.py
index 409af563..f68ac562 100644
--- a/activedata_etl/transforms/task_cluster_to_test_result.py
+++ b/activedata_etl/transforms/task_cluster_to_test_result.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/treeherder_to_normalized.py b/activedata_etl/transforms/treeherder_to_normalized.py
index 21492f32..56c49b7f 100644
--- a/activedata_etl/transforms/treeherder_to_normalized.py
+++ b/activedata_etl/transforms/treeherder_to_normalized.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/transforms/unittest_logs_to_sink.py b/activedata_etl/transforms/unittest_logs_to_sink.py
index 91953df2..ab9852a3 100644
--- a/activedata_etl/transforms/unittest_logs_to_sink.py
+++ b/activedata_etl/transforms/unittest_logs_to_sink.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division, unicode_literals
 
diff --git a/activedata_etl/update_etl.py b/activedata_etl/update_etl.py
index d57a4a43..60ccb8cb 100644
--- a/activedata_etl/update_etl.py
+++ b/activedata_etl/update_etl.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/activedata_etl/update_push_to_es.py b/activedata_etl/update_push_to_es.py
index 65278484..03dd9b34 100644
--- a/activedata_etl/update_push_to_es.py
+++ b/activedata_etl/update_push_to_es.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division, unicode_literals
 
diff --git a/resources/scripts/file_to_es.py b/resources/scripts/file_to_es.py
index 85914d36..5d3f5e61 100644
--- a/resources/scripts/file_to_es.py
+++ b/resources/scripts/file_to_es.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 
diff --git a/tests/insert_document.py b/tests/insert_document.py
index 31d2ce85..2840ec27 100644
--- a/tests/insert_document.py
+++ b/tests/insert_document.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/tasks_to_s3.py b/tests/tasks_to_s3.py
index e499e1f1..4f0b0817 100644
--- a/tests/tasks_to_s3.py
+++ b/tests/tasks_to_s3.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_buildbot_log.py b/tests/test_buildbot_log.py
index 2e54d809..3e8c5b56 100644
--- a/tests/test_buildbot_log.py
+++ b/tests/test_buildbot_log.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_coverage.py b/tests/test_coverage.py
index 559854a5..d2aa4cd1 100644
--- a/tests/test_coverage.py
+++ b/tests/test_coverage.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_es.py b/tests/test_es.py
index a891315e..50f95ae2 100644
--- a/tests/test_es.py
+++ b/tests/test_es.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_etl_keys.py b/tests/test_etl_keys.py
index f4650160..a9bbaea4 100644
--- a/tests/test_etl_keys.py
+++ b/tests/test_etl_keys.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 from __future__ import division
diff --git a/tests/test_etl_speed.py b/tests/test_etl_speed.py
index a3110aa4..4ee8d6c2 100644
--- a/tests/test_etl_speed.py
+++ b/tests/test_etl_speed.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 from __future__ import division
diff --git a/tests/test_fx_test.py b/tests/test_fx_test.py
index 4a7aa0e7..7f6fbc24 100644
--- a/tests/test_fx_test.py
+++ b/tests/test_fx_test.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_gcov.py b/tests/test_gcov.py
index 6d675989..8f30efae 100644
--- a/tests/test_gcov.py
+++ b/tests/test_gcov.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (klahnakoski@mozilla.com)
+# Contact: Kyle Lahnakoski (klahnakoski@mozilla.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_gcov_s3.py b/tests/test_gcov_s3.py
index 96ac6807..62035742 100644
--- a/tests/test_gcov_s3.py
+++ b/tests/test_gcov_s3.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (klahnakoski@mozilla.com)
+# Contact: Kyle Lahnakoski (klahnakoski@mozilla.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_grcov.py b/tests/test_grcov.py
index 277080b5..7c39b089 100644
--- a/tests/test_grcov.py
+++ b/tests/test_grcov.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (klahnakoski@mozilla.com)
+# Contact: Kyle Lahnakoski (klahnakoski@mozilla.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_job.py b/tests/test_job.py
index 28a66088..5285d4bb 100644
--- a/tests/test_job.py
+++ b/tests/test_job.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_jsdcov.py b/tests/test_jsdcov.py
index b019d83b..ea0b8fc0 100644
--- a/tests/test_jsdcov.py
+++ b/tests/test_jsdcov.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (klahnakoski@mozilla.com)
+# Contact: Kyle Lahnakoski (klahnakoski@mozilla.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_jsvm.py b/tests/test_jsvm.py
index 18aba00a..30ac489e 100644
--- a/tests/test_jsvm.py
+++ b/tests/test_jsvm.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (klahnakoski@mozilla.com)
+# Contact: Kyle Lahnakoski (klahnakoski@mozilla.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_metadata_name.py b/tests/test_metadata_name.py
index a195fd2d..36d78dbd 100644
--- a/tests/test_metadata_name.py
+++ b/tests/test_metadata_name.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_perfherder.py b/tests/test_perfherder.py
index 1accaa7a..651e9ecb 100644
--- a/tests/test_perfherder.py
+++ b/tests/test_perfherder.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_resource_usage.py b/tests/test_resource_usage.py
index f6bef1ba..38a49d8a 100644
--- a/tests/test_resource_usage.py
+++ b/tests/test_resource_usage.py
@@ -5,7 +5,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_unittest_etl.py b/tests/test_unittest_etl.py
index dd7f69d4..8c97ac57 100644
--- a/tests/test_unittest_etl.py
+++ b/tests/test_unittest_etl.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/tests/test_unittest_logs_to_sink.py b/tests/test_unittest_logs_to_sink.py
index 88fae17a..b453fdac 100644
--- a/tests/test_unittest_logs_to_sink.py
+++ b/tests/test_unittest_logs_to_sink.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import division
 from __future__ import unicode_literals
diff --git a/vendor/mo_fabric/__init__.py b/vendor/mo_fabric/__init__.py
index 406afc52..60550668 100644
--- a/vendor/mo_fabric/__init__.py
+++ b/vendor/mo_fabric/__init__.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import absolute_import, division, unicode_literals
 
diff --git a/vendor/mo_hg/hg_branches.py b/vendor/mo_hg/hg_branches.py
index a26c9409..9adba3bd 100644
--- a/vendor/mo_hg/hg_branches.py
+++ b/vendor/mo_hg/hg_branches.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import unicode_literals
 
diff --git a/vendor/mo_hg/parse.py b/vendor/mo_hg/parse.py
index 49e21231..40a66556 100644
--- a/vendor/mo_hg/parse.py
+++ b/vendor/mo_hg/parse.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import absolute_import, division, unicode_literals
 
diff --git a/vendor/mo_hg/relay/cache.py b/vendor/mo_hg/relay/cache.py
index 686d3475..eb76a0e1 100644
--- a/vendor/mo_hg/relay/cache.py
+++ b/vendor/mo_hg/relay/cache.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 from __future__ import division, unicode_literals
diff --git a/vendor/mo_hg/repos/changesets.py b/vendor/mo_hg/repos/changesets.py
index ed92986c..b110b9d5 100644
--- a/vendor/mo_hg/repos/changesets.py
+++ b/vendor/mo_hg/repos/changesets.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 from __future__ import absolute_import, division, unicode_literals
diff --git a/vendor/mo_hg/repos/pushs.py b/vendor/mo_hg/repos/pushs.py
index 9585ab37..e62c4a7b 100644
--- a/vendor/mo_hg/repos/pushs.py
+++ b/vendor/mo_hg/repos/pushs.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 from __future__ import absolute_import, division, unicode_literals
diff --git a/vendor/mo_hg/repos/revisions.py b/vendor/mo_hg/repos/revisions.py
index 96072f11..04127fcf 100644
--- a/vendor/mo_hg/repos/revisions.py
+++ b/vendor/mo_hg/repos/revisions.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 
 from __future__ import absolute_import, division, unicode_literals
diff --git a/vendor/tuid/app.py b/vendor/tuid/app.py
index 17f7e007..c7777404 100644
--- a/vendor/tuid/app.py
+++ b/vendor/tuid/app.py
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# Author: Kyle Lahnakoski (kyle@lahnakoski.com)
+# Contact: Kyle Lahnakoski (kyle@lahnakoski.com)
 #
 from __future__ import absolute_import
 from __future__ import division