diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index e61f26500..5574191a6 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -2,10 +2,11 @@ This module has grown over time based on a range of contributions from
 people using it. If you follow these contributing guidelines your patch
 will likely make it into a release a little quicker.
 
-
 ## Contributing
 
-Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. [Contributor Code of Conduct](https://voxpupuli.org/coc/).
+Please note that this project is released with a Contributor Code of Conduct.
+By participating in this project you agree to abide by its terms.
+[Contributor Code of Conduct](https://voxpupuli.org/coc/).
 
 1. Fork the repo.
 
@@ -76,7 +77,6 @@ To run the linter, the syntax checker and the unit tests:
 
     bundle exec rake test
 
-
 ## Integration tests
 
 The unit tests just check the code runs, not that it does exactly what
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9ac4a2b00..f6f4f86e7 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,23 +1,25 @@
 <!--
 Thank you for contributing to this project!
+
 - This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
 - Please check that here is no existing issue or PR that addresses your problem.
 - Please fill the following form to enable us to help you.
+
 -->
 
-### Affected Puppet, Ruby, OS and module versions/distributions
+## Affected Puppet, Ruby, OS and module versions/distributions
 
 - Puppet:
 - Ruby:
 - Distribution:
 - Module version:
 
-### How to reproduce (e.g Puppet code you use)
+## How to reproduce (e.g Puppet code you use)
 
-### What are you seeing
+## What are you seeing
 
-### What behaviour did you expect instead
+## What behaviour did you expect instead
 
-### Output log
+## Output log
 
-### Any additional information you'd like to impart
+## Any additional information you'd like to impart
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 79272bf60..92f2e5983 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,7 @@
 <!--
 Thank you for contributing to this project!
+
 - This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
 - Please check that here is no existing issue or PR that addresses your problem.
+
 -->
diff --git a/.gitignore b/.gitignore
index aa3993d37..82426da6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,5 @@ coverage/
 log/
 .idea/
 *.iml
-.*.sw
+.*.sw?
 .yardoc/
diff --git a/.msync.yml b/.msync.yml
index e24f90868..a7e7e88a6 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.15.0'
+modulesync_config_version: '0.16.3'
diff --git a/.travis.yml b/.travis.yml
index a7a762001..143ffe1c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,24 +23,22 @@ matrix:
     env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.1.9
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.2.5
+  - rvm: 2.2.6
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.3.1
+  - rvm: 2.3.3
     env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
-  - rvm: 2.3.1
+  - rvm: 2.3.3
     env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
-  - rvm: 2.3.1
+  - rvm: 2.3.3
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.4.0-preview1
+  - rvm: 2.4.0-preview3
     env: PUPPET_VERSION="~> 4.0" CHECK=test
   allow_failures:
-    - rvm: 2.4.0-preview1
+    - rvm: 2.4.0-preview3
 notifications:
   email: false
 deploy:
   provider: puppetforge
-  deploy:
-    branch: ha-bug-puppet-forge
   user: puppet
   password:
     secure: "FAK3Izs5bSZyblGvcFnGWm0exZV5+v9pbwfRDD2oihWxX3U3pArGW+3XcwcJfLQgrUYBsOTmHC8yPjlgTBYeIt/5pvg9X+3jwNgeto6kozpI/nvAq4NtcHhzxRejuPELhFYeXZ3hEw0w+v/ZRo2cNLwI0LLpiWEDvCMZN1CJ2RY="
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index eab20f451..fa1d9e5f8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,7 @@
 require 'rspec-puppet-facts'
 include RspecPuppetFacts
 
-unless RUBY_VERSION =~ %r{^1.9}
+if Dir.exist?(File.expand_path('../../lib', __FILE__)) && RUBY_VERSION !~ %r{^1.9}
   require 'coveralls'
   require 'simplecov'
   require 'simplecov-console'
@@ -12,7 +12,10 @@
     Coveralls::SimpleCov::Formatter
   ]
   SimpleCov.start do
+    track_files 'lib/**/*.rb'
     add_filter '/spec'
+    add_filter '/vendor'
+    add_filter '/.vendor'
   end
 end