diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..75294eb
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+# https://editorconfig.org
+root = true
+[*.rb]
+indent_style = space
+indent_size = 2
+tab_width = 2
diff --git a/between_meals.gemspec b/between_meals.gemspec
index b14fc10..8bd4f6e 100644
--- a/between_meals.gemspec
+++ b/between_meals.gemspec
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/changes/change.rb b/lib/between_meals/changes/change.rb
index 898fe6c..4a1385f 100644
--- a/lib/between_meals/changes/change.rb
+++ b/lib/between_meals/changes/change.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/changes/cookbook.rb b/lib/between_meals/changes/cookbook.rb
index 4e9686c..493662b 100644
--- a/lib/between_meals/changes/cookbook.rb
+++ b/lib/between_meals/changes/cookbook.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/changes/databag.rb b/lib/between_meals/changes/databag.rb
index 89358ba..507266d 100644
--- a/lib/between_meals/changes/databag.rb
+++ b/lib/between_meals/changes/databag.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/changes/role.rb b/lib/between_meals/changes/role.rb
index a69ee97..6a9d5a2 100644
--- a/lib/between_meals/changes/role.rb
+++ b/lib/between_meals/changes/role.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/changeset.rb b/lib/between_meals/changeset.rb
index eedd2de..f5bbcf3 100644
--- a/lib/between_meals/changeset.rb
+++ b/lib/between_meals/changeset.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/cmd.rb b/lib/between_meals/cmd.rb
index 96d8f90..16aaa68 100644
--- a/lib/between_meals/cmd.rb
+++ b/lib/between_meals/cmd.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/knife.rb b/lib/between_meals/knife.rb
index c1d5379..24ad0c3 100755
--- a/lib/between_meals/knife.rb
+++ b/lib/between_meals/knife.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/repo.rb b/lib/between_meals/repo.rb
index fde5fde..582e40b 100755
--- a/lib/between_meals/repo.rb
+++ b/lib/between_meals/repo.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/repo/git.rb b/lib/between_meals/repo/git.rb
index 4046ce3..45c1c3d 100755
--- a/lib/between_meals/repo/git.rb
+++ b/lib/between_meals/repo/git.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/repo/git/cmd.rb b/lib/between_meals/repo/git/cmd.rb
index 71e9777..f9f26d6 100644
--- a/lib/between_meals/repo/git/cmd.rb
+++ b/lib/between_meals/repo/git/cmd.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/repo/hg.rb b/lib/between_meals/repo/hg.rb
index b5fba71..0485fc9 100644
--- a/lib/between_meals/repo/hg.rb
+++ b/lib/between_meals/repo/hg.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/repo/hg/cmd.rb b/lib/between_meals/repo/hg/cmd.rb
index 6d9c0c0..91400d5 100644
--- a/lib/between_meals/repo/hg/cmd.rb
+++ b/lib/between_meals/repo/hg/cmd.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/repo/svn.rb b/lib/between_meals/repo/svn.rb
index c02d24f..6554f09 100755
--- a/lib/between_meals/repo/svn.rb
+++ b/lib/between_meals/repo/svn.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/repo/svn/cmd.rb b/lib/between_meals/repo/svn/cmd.rb
index fb0bc93..d64b68b 100644
--- a/lib/between_meals/repo/svn/cmd.rb
+++ b/lib/between_meals/repo/svn/cmd.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/between_meals/util.rb b/lib/between_meals/util.rb
index 229253e..ed16b16 100644
--- a/lib/between_meals/util.rb
+++ b/lib/between_meals/util.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/cookbook_spec.rb b/spec/cookbook_spec.rb
index 16143a1..32fc08c 100644
--- a/spec/cookbook_spec.rb
+++ b/spec/cookbook_spec.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/databag_spec.rb b/spec/databag_spec.rb
index 7c2c389..25ef3ea 100644
--- a/spec/databag_spec.rb
+++ b/spec/databag_spec.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/git_spec.rb b/spec/git_spec.rb
index 0478143..b3eece2 100644
--- a/spec/git_spec.rb
+++ b/spec/git_spec.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/hg_spec.rb b/spec/hg_spec.rb
index 60b3cfe..07068fe 100644
--- a/spec/hg_spec.rb
+++ b/spec/hg_spec.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/repo_subclass_conformance.rb b/spec/repo_subclass_conformance.rb
index c11a1ec..fa0e4a0 100644
--- a/spec/repo_subclass_conformance.rb
+++ b/spec/repo_subclass_conformance.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/role_spec.rb b/spec/role_spec.rb
index d1ad2f3..918db8b 100644
--- a/spec/role_spec.rb
+++ b/spec/role_spec.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/spec/svn_spec.rb b/spec/svn_spec.rb
index 0cac086..b034888 100644
--- a/spec/svn_spec.rb
+++ b/spec/svn_spec.rb
@@ -1,5 +1,3 @@
-# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
-
 # Copyright 2013-present Facebook
 #
 # Licensed under the Apache License, Version 2.0 (the "License");