diff --git a/Gemfile b/Gemfile
index a1c9e84c..be3fddfe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-#  Copyright 2015 Puppet Community
+#  Copyright 2016 Vox Pupuli
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -24,3 +24,4 @@ group :development do
   gem 'travis'
   gem 'travis-lint'
 end
+# vim: syntax=ruby
diff --git a/README.md b/README.md
index f849baff..d46330d4 100644
--- a/README.md
+++ b/README.md
@@ -29,3 +29,4 @@ $ msync update -f {module_name} --noop
 $ cd modules/{module_name}
 # edit then git commit/push
 ```
+# vim: syntax=markdown
diff --git a/Rakefile b/Rakefile
index 200976bf..431b844e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
-#  Copyright 2015 Puppet Community
+#  Copyright 2016 Vox Pupuli
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -14,3 +14,4 @@
 require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
+# vim: syntax=ruby
diff --git a/config_defaults.yml b/config_defaults.yml
index 9ca6fa0c..e1b64ca6 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -65,5 +65,5 @@ Rakefile:
   - 'lint'
   - 'syntax'
   - 'spec'
-
 ...
+# vim: syntax=yaml
diff --git a/managed_modules.yml b/managed_modules.yml
index fe8ce4b7..527b38d7 100644
--- a/managed_modules.yml
+++ b/managed_modules.yml
@@ -36,3 +36,5 @@
 - puppet-windows_power
 - puppet-windowsfeature
 - puppet-zabbix
+...
+# vim: syntax=yaml
diff --git a/moduleroot/CONTRIBUTING.md b/moduleroot/CONTRIBUTING.md
index 00deb27d..8cac3bde 100644
--- a/moduleroot/CONTRIBUTING.md
+++ b/moduleroot/CONTRIBUTING.md
@@ -94,3 +94,4 @@ can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will
 at least need `BEAKER_PROVISION` set to yes (the default). The Vagrantfile
 for the created virtual machines will be in `.vagrant/beaker_vagrant_fies`.
 
+# vim: syntax=markdown
diff --git a/moduleroot/Gemfile b/moduleroot/Gemfile
index 446949de..f436fb67 100644
--- a/moduleroot/Gemfile
+++ b/moduleroot/Gemfile
@@ -59,4 +59,4 @@ end
 ENV['PUPPET_VERSION'].nil? ? puppetversion = '<%= @configs['puppet_version'] || '~> 4.0' %>' : puppetversion = ENV['PUPPET_VERSION'].to_s
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
-# vim:ft=ruby
+# vim: syntax=ruby
diff --git a/moduleroot/Rakefile b/moduleroot/Rakefile
index 7ab0cb79..979cb8ae 100644
--- a/moduleroot/Rakefile
+++ b/moduleroot/Rakefile
@@ -37,3 +37,4 @@ task test: [
   :<%= t %>,
 <% end -%>
 ]
+# vim: syntax=ruby
diff --git a/moduleroot/spec/acceptance/nodesets/centos-511-x64.yml b/moduleroot/spec/acceptance/nodesets/centos-511-x64.yml
index ca14463e..a7878634 100644
--- a/moduleroot/spec/acceptance/nodesets/centos-511-x64.yml
+++ b/moduleroot/spec/acceptance/nodesets/centos-511-x64.yml
@@ -1,3 +1,4 @@
+---
 HOSTS:
   centos-511-x64:
     roles:
@@ -7,3 +8,5 @@ HOSTS:
     hypervisor: vagrant
 CONFIG:
   type: foss
+...
+# vim: syntax=yaml
diff --git a/moduleroot/spec/acceptance/nodesets/centos-66-x64-pe.yml b/moduleroot/spec/acceptance/nodesets/centos-66-x64-pe.yml
index 9a930370..0da6913c 100644
--- a/moduleroot/spec/acceptance/nodesets/centos-66-x64-pe.yml
+++ b/moduleroot/spec/acceptance/nodesets/centos-66-x64-pe.yml
@@ -1,3 +1,4 @@
+---
 HOSTS:
   centos-66-x64:
     roles:
@@ -9,3 +10,5 @@ HOSTS:
     hypervisor: vagrant
 CONFIG:
   type: pe
+...
+# vim: syntax=yaml
diff --git a/moduleroot/spec/acceptance/nodesets/centos-66-x64.yml b/moduleroot/spec/acceptance/nodesets/centos-66-x64.yml
index 214318a1..dff02def 100644
--- a/moduleroot/spec/acceptance/nodesets/centos-66-x64.yml
+++ b/moduleroot/spec/acceptance/nodesets/centos-66-x64.yml
@@ -1,3 +1,4 @@
+---
 HOSTS:
   centos-66-x64:
     roles:
@@ -7,3 +8,5 @@ HOSTS:
     hypervisor: vagrant
 CONFIG:
   type: foss
+...
+# vim: syntax=yaml
diff --git a/moduleroot/spec/acceptance/nodesets/centos-72-x64.yml b/moduleroot/spec/acceptance/nodesets/centos-72-x64.yml
index 2c628fc6..b5ec2034 100644
--- a/moduleroot/spec/acceptance/nodesets/centos-72-x64.yml
+++ b/moduleroot/spec/acceptance/nodesets/centos-72-x64.yml
@@ -1,3 +1,4 @@
+---
 HOSTS:
   centos-72-x64:
     roles:
@@ -7,3 +8,5 @@ HOSTS:
     hypervisor: vagrant
 CONFIG:
   type: foss
+...
+# vim: syntax=yaml
diff --git a/moduleroot/spec/acceptance/nodesets/debian-78-x64.yml b/moduleroot/spec/acceptance/nodesets/debian-78-x64.yml
index 2baa693e..8b71f390 100644
--- a/moduleroot/spec/acceptance/nodesets/debian-78-x64.yml
+++ b/moduleroot/spec/acceptance/nodesets/debian-78-x64.yml
@@ -1,3 +1,4 @@
+---
 HOSTS:
   debian-78-x64:
     roles:
@@ -7,3 +8,5 @@ HOSTS:
     hypervisor: vagrant
 CONFIG:
   type: foss
+...
+# vim: syntax=yaml
diff --git a/moduleroot/spec/acceptance/nodesets/debian-82-x64.yml b/moduleroot/spec/acceptance/nodesets/debian-82-x64.yml
index f496f121..83e3660c 100644
--- a/moduleroot/spec/acceptance/nodesets/debian-82-x64.yml
+++ b/moduleroot/spec/acceptance/nodesets/debian-82-x64.yml
@@ -1,3 +1,4 @@
+---
 HOSTS:
   debian-82-x64:
     roles:
@@ -7,3 +8,5 @@ HOSTS:
     hypervisor: vagrant
 CONFIG:
   type: foss
+...
+# vim: syntax=yaml
diff --git a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml b/moduleroot/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml
index fa94e2c0..52ba020a 100644
--- a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml
+++ b/moduleroot/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml
@@ -1,3 +1,4 @@
+---
 HOSTS:
   ubuntu-server-1204-x64:
     roles:
@@ -7,3 +8,5 @@ HOSTS:
     hypervisor: vagrant
 CONFIG:
   type: foss
+...
+# vim: syntax=yaml
diff --git a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
index 72ba9c2d..407e82b6 100644
--- a/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ b/moduleroot/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -1,3 +1,4 @@
+---
 HOSTS:
   ubuntu-server-1404-x64:
     roles:
@@ -7,3 +8,5 @@ HOSTS:
     hypervisor: vagrant
 CONFIG:
   type: foss
+...
+# vim: syntax=yaml
diff --git a/moduleroot/spec/classes/coverage_spec.rb b/moduleroot/spec/classes/coverage_spec.rb
index c083569a..de446548 100644
--- a/moduleroot/spec/classes/coverage_spec.rb
+++ b/moduleroot/spec/classes/coverage_spec.rb
@@ -1,3 +1,4 @@
 require 'rspec-puppet'
 
 at_exit { RSpec::Puppet::Coverage.report! }
+# vim: syntax=ruby
diff --git a/moduleroot/spec/spec_helper.rb b/moduleroot/spec/spec_helper.rb
index afa5df46..78dbc531 100644
--- a/moduleroot/spec/spec_helper.rb
+++ b/moduleroot/spec/spec_helper.rb
@@ -4,3 +4,4 @@
 <%- [@configs['spec_overrides']].flatten.compact.each do |line| -%>
  <%= line %>
 <%- end -%>
+# vim: syntax=ruby
diff --git a/modulesync.yml b/modulesync.yml
index c24b8aa0..f9a63863 100644
--- a/modulesync.yml
+++ b/modulesync.yml
@@ -3,3 +3,5 @@ git_base: 'git@github.com:'
 namespace: voxpupuli
 branch: modulesync
 message: "Update from voxpupuli modulesync_config"
+...
+# vim: syntax=yaml