diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..03c312d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+Gemfile.lock
+.bundled_gems
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..7accde3
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,29 @@
+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'
+  #The puppet-gerrit module makes too much use of empty string defaults
+  #so disable this check for now
+  #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
diff --git a/manifests/init.pp b/manifests/init.pp
index 0e499b2..7a92300 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -54,7 +54,7 @@ class zuul (
   $block_referers = [],
 ) {
   include ::httpd
-  include pip
+  include ::pip
 
   $packages = [
     'gcc',  # yappi requires this to build
diff --git a/manifests/merger.pp b/manifests/merger.pp
index a28e2fa..7181f07 100644
--- a/manifests/merger.pp
+++ b/manifests/merger.pp
@@ -42,8 +42,8 @@ class zuul::merger (
     }
   }
 
-  include logrotate
-  logrotate::file { 'merger.log':
+  include ::logrotate
+  ::logrotate::file { 'merger.log':
     log     => '/var/log/zuul/merger.log',
     options => [
       'compress',
@@ -54,7 +54,7 @@ class zuul::merger (
     ],
     require => Service['zuul-merger'],
   }
-  logrotate::file { 'merger-debug.log':
+  ::logrotate::file { 'merger-debug.log':
     log     => '/var/log/zuul/merger-debug.log',
     options => [
       'compress',
diff --git a/manifests/server.pp b/manifests/server.pp
index 59aa489..b258f19 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -59,8 +59,8 @@ class zuul::server (
     }
   }
 
-  include logrotate
-  logrotate::file { 'zuul.log':
+  include ::logrotate
+  ::logrotate::file { 'zuul.log':
     log     => '/var/log/zuul/zuul.log',
     options => [
       'compress',
@@ -71,7 +71,7 @@ class zuul::server (
     ],
     require => Service['zuul'],
   }
-  logrotate::file { 'zuul-debug.log':
+  ::logrotate::file { 'zuul-debug.log':
     log     => '/var/log/zuul/debug.log',
     options => [
       'compress',