diff --git a/.gitignore b/.gitignore
index ec414a8..f32b48b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *.swp
 pkg
+Gemfile.lock
+.bundled_gems/
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..96912da
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,30 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'puppetlabs_spec_helper', :require => false
+
+  gem 'metadata-json-lint'
+  # This is nice and all, but let's not worry about it until we've actually
+  # got puppet 4.x sorted
+  # gem 'puppet-lint-param-docs'
+  gem 'puppet-lint-absolute_classname-check'
+  gem 'puppet-lint-absolute_template_path'
+  gem 'puppet-lint-trailing_newline-check'
+
+  # Puppet 4.x related lint checks
+  gem 'puppet-lint-unquoted_string-check'
+  gem 'puppet-lint-empty_string-check'
+  gem 'puppet-lint-leading_zero-check'
+  gem 'puppet-lint-variable_contains_upcase'
+  gem 'puppet-lint-spaceship_operator_without_tag-check'
+  gem 'puppet-lint-undef_in_function-check'
+
+  if puppetversion = ENV['PUPPET_GEM_VERSION']
+    gem 'puppet', puppetversion, :require => false
+  else
+    gem 'puppet', '~> 3.0', :require => false
+  end
+
+end
+
+# vim:ft=ruby
diff --git a/manifests/init.pp b/manifests/init.pp
index 1cd56ae..d419eaa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -23,10 +23,10 @@ class yum (
   }
 
   file { $repos_dir:
-    ensure  => directory,
-    mode    => '0755',
-    owner   => 'root',
-    group   => 'root',
+    ensure => directory,
+    mode   => '0755',
+    owner  => 'root',
+    group  => 'root',
   }
 
 }
diff --git a/manifests/mirror.pp b/manifests/mirror.pp
index afa1260..02032a9 100644
--- a/manifests/mirror.pp
+++ b/manifests/mirror.pp
@@ -18,7 +18,7 @@ class yum::mirror (
   $vhost_name = $::fqdn,
 ) {
 
-  include yum
+  include ::yum
   include ::httpd
 
   ::httpd::vhost { $vhost_name:
diff --git a/manifests/repo.pp b/manifests/repo.pp
index e5417cd..6cde9fb 100644
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -15,7 +15,7 @@
 # Class: yum::repo
 #
 define yum::repo (
-  $description = '',
+  $description = undef,
   $url_path    = false,
   $enabled     = 0,
   $gpgcheck    = 0,
@@ -25,15 +25,15 @@ define yum::repo (
   $cron_minute = 0,
 ) {
 
-  include 'yum'
+  include ::yum
 
   yumrepo { $name:
-    name        => $name,
-    descr       => $description,
-    enabled     => $enabled,
-    gpgcheck    => $gpgcheck,
-    baseurl     => $baseurl,
-    mirrorlist  => $mirrorlist,
+    name       => $name,
+    descr      => $description,
+    enabled    => $enabled,
+    gpgcheck   => $gpgcheck,
+    baseurl    => $baseurl,
+    mirrorlist => $mirrorlist,
   }
 
   cron { "reposync ${name}":