diff --git a/.gitignore b/.gitignore
index 133e989c..ffab3ae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,36 @@
-.vagrant
+# This file is managed centrally by modulesync
+#   https://github.com/theforeman/foreman-installer-modulesync
+
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
 *.swp
 *.swo
+tags
 
+## Bundler
+Gemfile.lock
 .bundle
 vendor/
 
-pkg/
-
-Gemfile.lock
-
+## rbenv / rvm
 .rbenv*
 .rvmrc*
-.ruby-version
+.ruby-*
 
+## rspec
 spec/fixtures/
+
+## Puppet module
+pkg/
+coverage/
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
new file mode 100644
index 00000000..50816ba3
--- /dev/null
+++ b/.puppet-lint.rc
@@ -0,0 +1,3 @@
+--fail-on-warnings
+--no-80chars-check
+--no-class_inherits_from_params_class-check
diff --git a/.travis.yml b/.travis.yml
index 04f889c0..3ed90189 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,12 @@
 ---
-language: ruby
-bundler_args: --without development
-before_install: rm Gemfile.lock || true
+# This file is managed centrally by modulesync
+#   https://github.com/katello/foreman-installer-modulesync
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-script: bundle exec rake test
+  - 2.1.5
 env:
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.3.0"
-  - PUPPET_VERSION="~> 3.4.0"
-  - PUPPET_VERSION="~> 3.5.0"
-  - PUPPET_VERSION="~> 3.6.0"
-matrix:
-  exclude:
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.2.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.3.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.4.0"
+  - PUPPET_VERSION=3.5
+bundler_args: --without development
+sudo: false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e329c37f..61ea6cb5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,87 +1,248 @@
-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.
+Checklist (and a short version for the impatient)
+=================================================
 
+  * Commits:
 
-## Contributing
+    - Make commits of logical units.
 
-1. Fork the repo.
+    - Check for unnecessary whitespace with "git diff --check" before
+      committing.
 
-2. Run the tests. We only take pull requests with passing tests, and
-   it's great to know that you have a clean slate
+    - Commit using Unix line endings (check the settings around "crlf" in
+      git-config(1)).
 
-3. Add a test for your change. Only refactoring and documentation
-   changes require no new tests. If you are adding functionality
-   or fixing a bug, please add a test.
+    - Do not check in commented out code or unneeded files.
 
-4. Make the test pass.
+    - The first line of the commit message should be a short
+      description (50 characters is the soft limit, excluding ticket
+      number(s)), and should skip the full stop.
 
-5. Open an issue here - http://projects.theforeman.org/projects/katello/issues/new
+    - If you have a [http://projects.theforeman.org/](Redmine issue)
+      number, associate the issue in the message.  The first line should start
+      with the issue number in the form "fixes #XXXX - rest of message".
+      [More information on the Redmine style](http://projects.theforeman.org/projects/foreman/wiki/Reviewing_patches-commit_message_format).
+      Tickets are not required for our installer Puppet modules.
 
-6. Ensure commit message begins with 'Fixes #<redmine_issue_number>'
+    - If you have a GitHub issue number, associate the issue in the message.
+      End the commit message with "Fixes GH-1234" on a new line.
 
-5. Push to your fork andaa submit a pull request.
+    - The body should provide a meaningful commit message, which:
 
+      - uses the imperative, present tense: "change", not "changed" or
+        "changes".
 
-## Dependencies
+      - includes motivation for the change, and contrasts its
+        implementation with the previous behavior.
 
-The testing and development tools have a bunch of dependencies,
-all managed by [bundler](http://bundler.io/) according to the
-[Puppet support matrix](http://docs.puppetlabs.com/guides/platforms.html#ruby-versions).
+    - Make sure that you have tests for the bug you are fixing, or
+      feature you are adding.
 
-By default the tests use a baseline version of Puppet.
+    - Make sure the test suites passes after your commit:
+      `bundle exec rake spec` More information on [testing](#Testing) below
 
-If you have Ruby 2.x or want a specific version of Puppet,
-you must set an environment variable such as:
+    - When introducing a large change, make sure it is properly
+      documented in the README.md
 
-    export PUPPET_VERSION="~> 3.2.0"
+  * Submission:
 
-Install the dependencies like so...
+    * Pre-requisites:
 
-    bundle install
+      - Make sure you have a [GitHub account](https://github.com/join)
 
-## Syntax and style
+    * Preferred method:
 
-The test suite will run [Puppet Lint](http://puppet-lint.com/) and
-[Puppet Syntax](https://github.com/gds-operations/puppet-syntax) to
-check various syntax and style things. You can run these locally with:
+      - Fork the repository on GitHub.
 
-    bundle exec rake lint
-    bundle exec rake syntax
+      - Push your changes to a topic branch in your fork of the
+        repository, in a new branch.
 
-## Running the unit tests
+      - Submit a pull request to the repository in the 'katello'
+        organization.
 
-The unit test suite covers most of the code, as mentioned above please
-add tests if you're adding new functionality. If you've not used
-[rspec-puppet](http://rspec-puppet.com/) before then feel free to ask
-about how best to test your new feature. Running the test suite is done
-with:
+The long version
+================
 
-    bundle exec rake spec
+  1.  Make separate commits for logically separate changes.
 
-Note also you can run the syntax, style and unit tests in one go with:
+      Please break your commits down into logically consistent units
+      which include new or changed tests relevant to the rest of the
+      change.  The goal of doing this is to make the diff easier to
+      read for whoever is reviewing your code.  In general, the easier
+      your diff is to read, the more likely someone will be happy to
+      review it and get it into the code base.
 
-    bundle exec rake test
+      If you are going to refactor a piece of code, please do so as a
+      separate commit from your feature or bug fix changes.
 
-## Integration tests
+      If you have many commits to fix one issue, use `git rebase` or
+      `git commit --amend` to combine them into a single commit.
 
-The unit tests just check the code runs, not that it does exactly what
-we want on a real machine. For that we're using
-[beaker](https://github.com/puppetlabs/beaker).
+      We also really appreciate changes that include tests to make
+      sure the bug is not re-introduced, and that the feature is not
+      accidentally broken.
 
-This fires up a new virtual machine (using vagrant) and runs a series of
-simple tests against it after applying the module. You can run this
-with:
+      Describe the technical detail of the change(s).  If your
+      description starts to get too long, that is a good sign that you
+      probably need to split up your commit into more finely grained
+      pieces.
 
-    bundle exec rake acceptance
+      Commits which plainly describe the things which help
+      reviewers check the patch and future developers understand the
+      code are much more likely to be merged in with a minimum of
+      bike-shedding or requested changes.  Ideally, the commit message
+      would include information, and be in a form suitable for
+      inclusion in the release notes for the version of Puppet that
+      includes them.
 
-This will run the tests on an Ubuntu 12.04 virtual machine. You can also
-run the integration tests against Centos 6.5 with.
+      Please also check that you are not introducing any trailing
+      whitespace or other "whitespace errors".  You can do this by
+      running "git diff --check" on your changes before you commit.
 
-    RS_SET=centos-64-x64 bundle exec rake acceptances
+  2.  Sending your patches
 
-If you don't want to have to recreate the virtual machine every time you
-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`.
+      To submit your changes via a GitHub pull request, we _highly_
+      recommend that you have them on a topic branch, instead of
+      directly on "master".
+      It makes things much easier to keep track of, especially if
+      you decide to work on another thing before your first change
+      is merged in.
+
+      GitHub has some pretty good
+      [general documentation](http://help.github.com/) on using
+      their site.  They also have documentation on
+      [creating pull requests](http://help.github.com/send-pull-requests/).
+
+      In general, after pushing your topic branch up to your
+      repository on GitHub, you can switch to the branch in the
+      GitHub UI and click "Pull Request" towards the top of the page
+      in order to open a pull request.
+
+
+  3.  Update the related GitHub issue.
+
+      If there is a GitHub issue associated with the change you
+      submitted, then you should update the ticket to include the
+      location of your branch, along with any other commentary you
+      may wish to make.
+
+Testing
+=======
+
+Getting Started
+---------------
+
+Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
+package manager such as [bundler](http://bundler.io/) what Ruby packages,
+or Gems, are required to build, develop, and test this software.
+
+Please make sure you have [bundler installed](http://bundler.io/#getting-started)
+on your system, then use it to install all dependencies needed for this project,
+by running
+
+```shell
+% bundle install
+Fetching gem metadata from https://rubygems.org/........
+Fetching gem metadata from https://rubygems.org/..
+Using rake (10.1.0)
+Using builder (3.2.2)
+-- 8><-- many more --><8 --
+Using rspec-system-puppet (2.2.0)
+Using serverspec (0.6.3)
+Using rspec-system-serverspec (1.0.0)
+Using bundler (1.3.5)
+Your bundle is complete!
+Use `bundle show [gemname]` to see where a bundled gem is installed.
+```
+
+NOTE some systems may require you to run this command with sudo.
+
+If you already have those gems installed, make sure they are up-to-date:
+
+```shell
+% bundle update
+```
+
+With all dependencies in place and up-to-date we can now run the tests:
+
+```shell
+% rake spec
+```
+
+This will execute all the [rspec tests](http://rspec-puppet.com/) tests
+under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
+and so on. rspec tests may have the same kind of dependencies as the
+module they are testing. While the module defines in its [Modulefile](./Modulefile),
+rspec tests define them in [.fixtures.yml](./fixtures.yml).
+
+Writing Tests
+-------------
+
+Our tests use [rspec-puppet](http://rspec-puppet.com/) to check that classes
+and defined types work when compiled with Puppet itself.  Ideally, we want to
+test the smallest logical units possible (i.e. a single class, not the whole
+module), which helps with speed and reduces work when changing other parts of
+the module.
+
+By writing tests we ensure that future versions of the module don't introduce
+regressions, and that we find issues sooner (in this project) rather than later
+(when used in a Foreman installation).
+
+Each class has its own file within spec/classes/, ending with "_spec.rb" and
+inside each test file is a section for each test scenario ("describe").
+
+A typical rspec-puppet test for a new class parameter would perhaps start with
+defining a set of parameters to pass into the class:
+
+    describe 'with colour parameter' do
+      let :params do
+        {:colour => 'red'}
+      end
+    end
+
+The test then has to check for the presence or absence of certain Puppet
+resources with or without certain properties and relationships.  e.g. a test
+for a service class would ensure the service resource is present, with the
+right name and the right ensure/enable properties.
+
+    describe 'with colour parameter' do
+      let :params do
+        {:colour => 'red'}
+      end
+
+      it 'should configure colour' do
+        should contain_file('/etc/service.conf').with_content('colour: red')
+      end
+    end
+
+More advanced topics:
+
+  * Use rspec-puppet-facts loops: some tests use a loop with "on_supported_os"
+    to test the class under every OS supported in metadata.json.
+  * Test presence of inter-resource require/notify relationships.
+
+
+If you have commit access to the repository
+===========================================
+
+Even if you have commit access to the repository, you will still need to
+go through the process above, and have someone else review and merge
+in your changes.  The rule is that all changes must be reviewed by a
+developer on the project (that did not write the code) to ensure that
+all changes go through a code review process.
+
+Having someone other than the author of the topic branch recorded as
+performing the merge is the record that they performed the code
+review.
+
+
+Additional Resources
+====================
+
+* [Support and contact details](http://theforeman.org/support.html)
+
+* [General Foreman contribution details](http://theforeman.org/contribute.html)
+
+* [General GitHub documentation](http://help.github.com/)
+
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
 
diff --git a/Gemfile b/Gemfile
index 59c3dcb8..b1a46c19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,20 +1,29 @@
-source "https://rubygems.org"
+# This file is managed centrally by modulesync
+#   https://github.com/katello/foreman-installer-modulesync
 
-group :test do
-  gem "rake"
-  gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0'
-  gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
-  gem "puppetlabs_spec_helper"
-  gem "metadata-json-lint"
-  gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]} # https://github.com/rspec/rspec-core/issues/1864
-end
+source 'https://rubygems.org'
 
-group :development do
-  gem "travis"
-  gem "travis-lint"
-  gem "beaker"
-  gem "beaker-rspec"
-  gem "vagrant-wrapper"
-  gem "puppet-blacksmith"
-  gem "guard-rake"
-end
+gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '~> 3.5'
+
+gem 'rake'
+gem 'rspec-puppet', '~> 2.0'
+gem 'puppetlabs_spec_helper', '>= 0.8.0'
+gem 'puppet-lint', '>= 1'
+gem 'puppet-lint-unquoted_string-check'
+gem 'puppet-lint-empty_string-check'
+gem 'puppet-lint-spaceship_operator_without_tag-check'
+gem 'puppet-lint-variable_contains_upcase'
+gem 'puppet-lint-absolute_classname-check'
+gem 'puppet-lint-undef_in_function-check'
+gem 'puppet-lint-leading_zero-check'
+gem 'puppet-lint-trailing_comma-check'
+gem 'puppet-lint-file_ensure-check'
+gem 'simplecov'
+gem 'puppet-blacksmith', '>= 3.1.0', {"groups"=>["development"]}
+gem 'rest-client', '< 1.7', {"platforms"=>["ruby_18"], "groups"=>["development"]}
+gem 'mime-types', '~> 1.0', {"platforms"=>["ruby_18"], "groups"=>["development"]}
+gem 'rspec-puppet-facts'
+gem 'metadata-json-lint'
+gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]}
+
+# vim:ft=ruby
diff --git a/Rakefile b/Rakefile
index 3c0c32ba..9a263048 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,42 +1,19 @@
+# This file is managed centrally by modulesync
+#   https://github.com/theforeman/foreman-installer-modulesync
+
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-require 'puppet-syntax/tasks/puppet-syntax'
 
-# These two gems aren't always present, for instance
-# on Travis with --without development
+# blacksmith isn't always present, e.g. on Travis with --without development
 begin
   require 'puppet_blacksmith/rake_tasks'
+  Blacksmith::RakeTask.new do |t|
+    t.tag_pattern = "%s"
+  end
 rescue LoadError
 end
 
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
-PuppetLint.configuration.fail_on_warnings = true
-
-# Forsake support for Puppet 2.6.2 for the benefit of cleaner code.
-# http://puppet-lint.com/checks/class_parameter_defaults/
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-# http://puppet-lint.com/checks/class_inherits_from_params_class/
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-# http://puppet-lint.com/checks/autoloader_layout/
-PuppetLint.configuration.send('disable_autoloader_layout')
-
-exclude_paths = [
-  "pkg/**/*",
-  "vendor/**/*",
-  "spec/**/*",
-]
-PuppetLint.configuration.ignore_paths = exclude_paths
-PuppetSyntax.exclude_paths = exclude_paths
-
-desc "Run acceptance tests"
-RSpec::Core::RakeTask.new(:acceptance) do |t|
-  t.pattern = 'spec/acceptance'
-end
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
+PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
 
-desc "Run syntax, lint, and spec tests."
-task :test => [
-  :syntax,
-  :lint,
-  :spec,
-]
+task :default => [:validate, :lint, :spec]
diff --git a/manifests/dispatch_router.pp b/manifests/dispatch_router.pp
index b6fb7f25..93c34efa 100644
--- a/manifests/dispatch_router.pp
+++ b/manifests/dispatch_router.pp
@@ -5,10 +5,10 @@
 class capsule::dispatch_router (
 ) {
 
-  class { 'qpid::router': }
+  class { '::qpid::router': }
 
   # SSL Certificate Configuration
-  class { 'certs::qpid_router':
+  class { '::certs::qpid_router':
     require => Class['qpid::router::install'],
   } ~>
   qpid::router::ssl_profile { 'client':
diff --git a/manifests/init.pp b/manifests/init.pp
index 55b857cb..856bd686 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -256,26 +256,26 @@
     false => '443'
   }
 
-  class { 'capsule::install': } ~>
-  class { 'certs::foreman_proxy':
+  class { '::capsule::install': } ~>
+  class { '::certs::foreman_proxy':
     hostname => $capsule_fqdn,
     require  => Package['foreman-proxy'],
     before   => Service['foreman-proxy'],
   } ~>
-  class { 'certs::katello':
+  class { '::certs::katello':
     deployment_url => $capsule::rhsm_url,
-    rhsm_port      => $capsule::rhsm_port
+    rhsm_port      => $capsule::rhsm_port,
   }
 
   if $pulp or $reverse_proxy_real {
-    class { 'certs::apache':
-      hostname => $capsule_fqdn
+    class { '::certs::apache':
+      hostname => $capsule_fqdn,
     } ~>
     Class['certs::foreman_proxy'] ~>
-    class { 'capsule::reverse_proxy':
+    class { '::capsule::reverse_proxy':
       path => '/',
       url  => "${foreman_url}/",
-      port => $capsule::reverse_proxy_port
+      port => $capsule::reverse_proxy_port,
     }
   }
 
@@ -294,12 +294,12 @@
     }
 
     if $qpid_router {
-      class { 'capsule::dispatch_router':
+      class { '::capsule::dispatch_router':
         require => Class['pulp'],
       }
     }
 
-    class { 'crane':
+    class { '::crane':
       cert    => $certs::apache::apache_cert,
       key     => $certs::apache::apache_key,
       ca_cert => $certs::server_ca_cert,
@@ -307,7 +307,7 @@
     }
   }
 
-  class { 'foreman_proxy':
+  class { '::foreman_proxy':
     custom_repo           => true,
     http                  => $foreman_proxy_http,
     http_port             => $foreman_proxy_http_port,
@@ -372,11 +372,11 @@
       priority        => '05',
       docroot         => '/var/www/html',
       options         => ['SymLinksIfOwnerMatch'],
-      custom_fragment => template('capsule/_pulp_includes.erb', 'capsule/httpd_pub.erb')
+      custom_fragment => template('capsule/_pulp_includes.erb', 'capsule/httpd_pub.erb'),
     }
 
-    class { 'certs::qpid': } ~>
-    class { 'pulp':
+    class { '::certs::qpid': } ~>
+    class { '::pulp':
       default_password            => $pulp_admin_password,
       oauth_key                   => $pulp_oauth_key,
       oauth_secret                => $pulp_oauth_secret,
@@ -386,7 +386,7 @@
       messaging_client_cert       => $certs::params::messaging_client_cert,
       messaging_url               => "ssl://${::fqdn}:5671",
     } ~>
-    class { 'pulp::child':
+    class { '::pulp::child':
       parent_fqdn          => $parent_fqdn,
       oauth_effective_user => $pulp_oauth_effective_user,
       oauth_key            => $pulp_oauth_key,
@@ -394,17 +394,17 @@
       server_ca_cert       => $certs::params::pulp_server_ca_cert,
     }
 
-    class { 'certs::pulp_child':
+    class { '::certs::pulp_child':
       hostname => $capsule_fqdn,
       notify   => [ Class['pulp'], Class['pulp::child'] ],
     }
   }
 
   if $puppet {
-    class { 'certs::puppet':
-      hostname => $capsule_fqdn
+    class { '::certs::puppet':
+      hostname => $capsule_fqdn,
     } ~>
-    class { 'puppet':
+    class { '::puppet':
       server                      => true,
       server_ca                   => $puppetca,
       server_foreman_url          => $foreman_url,
diff --git a/manifests/params.pp b/manifests/params.pp
index 254d9990..41fa0230 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,7 +1,7 @@
 # Default params for capsule settings
 class capsule::params {
 
-  include foreman_proxy::params
+  include ::foreman_proxy::params
 
   # when not specified, we expect all in one installation
   $parent_fqdn                = $::fqdn
@@ -23,7 +23,7 @@
 
   $puppet                        = false
   $puppetca                      = false
-  $puppet_ca_proxy               = ''
+  $puppet_ca_proxy               = undef
 
   $foreman_proxy_port            = '9090'
 
diff --git a/manifests/reverse_proxy.pp b/manifests/reverse_proxy.pp
index 9a6cf9a0..dda99e2d 100644
--- a/manifests/reverse_proxy.pp
+++ b/manifests/reverse_proxy.pp
@@ -43,6 +43,6 @@
     custom_fragment   => "
       SSLProxyCACertificateFile ${::certs::katello_server_ca_cert}
       SSLProxyMachineCertificateFile ${certs::foreman_proxy::foreman_proxy_ssl_client_bundle}
-    "
+    ",
   }
 }
diff --git a/metadata.json b/metadata.json
index e4fe0c0e..481a6fb1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -3,7 +3,7 @@
   "version": "0.2.0",
   "author": "Katello",
   "summary": "Deploys and manages a Capsule",
-  "license": "GPLv3+",
+  "license": "GPL-3.0+",
   "source": "https://github.com/Katello/puppet-capsule.git",
   "project_page": "https://github.com/Katello/puppet-capsule",
   "issues_url": "http://projects.theforeman.org/projects/katello/issues",
diff --git a/spec/spec.opts b/spec/spec.opts
new file mode 100644
index 00000000..2ef6682d
--- /dev/null
+++ b/spec/spec.opts
@@ -0,0 +1,6 @@
+--format
+documentation
+--colour
+--loadby
+mtime
+--backtrace
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2c6f5664..30a5bfbf 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1 +1,12 @@
+# This file is managed centrally by modulesync
+#   https://github.com/katello/foreman-installer-modulesync
+
 require 'puppetlabs_spec_helper/module_spec_helper'
+
+require 'rspec-puppet-facts'
+include RspecPuppetFacts
+
+# Workaround for no method in rspec-puppet to pass undef through :params
+class Undef
+  def inspect; 'undef'; end
+end