diff --git a/.travis.yml b/.travis.yml
index d4e5c10..a861257 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,15 +4,25 @@ language: ruby
 cache: bundler
 bundler_args: --without development
 script:
-  - "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+  - bundle exec rake validate
+  - bundle exec rake spec SPEC_OPTS='--format documentation'
+  - bundle exec rake lint
+
+before_install:
+  - gem update bundler
+
 matrix:
   fast_finish: true
   include:
   - rvm: 2.1.7
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.7
+  - rvm: 2.1.9
     env: PUPPET_GEM_VERSION="~> 4.0"
   - rvm: 2.3.1
     env: PUPPET_GEM_VERSION="~> 4.0"
+  allow_failures:
+  - rvm: 2.4.0
+    env: PUPPET_GEM_VERSION="~> 5.0"
+
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index 93bbcca..4e89e15 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,10 +17,10 @@ end
 supports_windows = false
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
-gem 'puppet-lint', '~> 2.0'
-gem 'puppetlabs_spec_helper', '~> 2.1'
-gem 'github_changelog_generator', '<= 1.14.3'
-gem 'rspec-puppet', '~> 2.5'
+gem 'puppet-lint'
+gem 'puppetlabs_spec_helper'
+gem 'github_changelog_generator'
+gem 'rspec-puppet'
 gem 'rspec-puppet-facts'
 gem 'rspec-puppet-utils'
 gem 'metadata-json-lint'
diff --git a/README.md b/README.md
index 76e81e7..61e1e48 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#Puppet module for HTCondor batch system
+# Puppet module for HTCondor batch system
 
 Latest stable version: https://github.com/HEP-Puppet/htcondor/releases/tag/v2.0.1
 
@@ -9,7 +9,7 @@ Development branch: https://github.com/HEP-Puppet/htcondor/tree/development
 Puppetforge: https://forge.puppetlabs.com/HEPPuppet/htcondor
 
 
-####Table of Contents
+#### Table of Contents
 1. [Overview - What is the htcondor module?](#overview)
 2. [Module Description - What does the module do?](#module-description)
 3. [Setup - The basics of getting started with htcondor](#setup)
@@ -18,12 +18,12 @@ Puppetforge: https://forge.puppetlabs.com/HEPPuppet/htcondor
 	* [Contributing to the htcondor module](#contributing)
     * [Running tests - A quick guide](#running-tests)
 
-##Overview
+## Overview
 The htcondor modules allows you to set up a HTCondor cluster (https://research.cs.wisc.edu/htcondor/).
 It depends on several other modules, including puppetlabs/(stdlib|concat|firewall).
 Please check the metadata.json for detailed dependencies.
 
-##Module Description
+## Module Description
 An HTCondor cluster consists of at least three types of nodes:
  * a worker for executing the jobs
  * a scheduler for job submission
@@ -32,13 +32,13 @@ An HTCondor cluster consists of at least three types of nodes:
 This puppet modules allows for the configuration of these three types of nodes.
 
 
-##Setup
+## Setup
 **What the htcondor module affects:**
  * configuration files and directories (/etc/condor/*)
  * installation of htcondor software (condor* packages)
  * a new fact for facter: condor_version
 
-###Beginning with HTCondor
+### Beginning with HTCondor
 Since admins might wish to run their own repository or disable repositories after install,
 the HTCondor repository is no longer included in the Puppet module since version 2.0.0.
 Therefore, the first step is to install the latest HTCondor repository for your OS (https://research.cs.wisc.edu/htcondor/yum/):
@@ -75,14 +75,14 @@ htcondor::custom_job_attributes:
 Although the use is identical, they are put into different places. `custom_attributes` end up added to the `STARTD_ATTRS`
 and `custom_job_attributes` are added to `STARTD_JOB_ATTRS`.
 
-##Limitations
-###General
+## Limitations
+### General
 
 
-##Development
+## Development
 
-###Contributing
-###Running tests
+### Contributing
+### Running tests
 Please run
 ```bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'```
 and make sure no errors are present when submitting code.
diff --git a/metadata.json b/metadata.json
index 9ec3486..4faeb8b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -3,17 +3,37 @@
   "version": "2.0.1",
   "summary": "Puppet module for HTCondor batch system",
   "author": "HEPPuppet",
-  "dependencies": [
+  "requirements": [
     {
       "name": "puppetlabs/firewall",
       "version_requirement": "~> 1.8"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": "~> 4.1"
+      "version_requirement": ">= 4.1"
     }
   ],
-  "source": "git@github.com:HEP-Puppet/puppet-htcondor.git",
+  "source": "https://github.com/HEP-Puppet",
   "project_page": "https://github.com/HEP-Puppet",
-  "license": "Apache-2.0"
+  "issues_url": "https://github.com/HEP-Puppet/htcondor/issues",
+  "license": "Apache-2.0",
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "dependencies": [
+
+  ]
 }