diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dade81e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+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/agent.pp b/manifests/agent.pp
index 7d37cb2..34d8545 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -25,7 +25,7 @@
 class logstash::agent (
   $conf_template = 'logstash/agent.conf.erb'
 ) {
-  include logstash
+  include ::logstash
 
   file { '/etc/init/logstash-agent.conf':
     ensure  => present,
diff --git a/manifests/indexer.pp b/manifests/indexer.pp
index fef371c..620365b 100644
--- a/manifests/indexer.pp
+++ b/manifests/indexer.pp
@@ -24,7 +24,7 @@
 class logstash::indexer (
   $conf_template = 'logstash/indexer.conf.erb'
 ) {
-  include logstash
+  include ::logstash
 
   file { '/etc/init/logstash-indexer.conf':
     ensure  => present,
@@ -53,7 +53,7 @@ class logstash::indexer (
     ]
   }
 
-  include logrotate
+  include ::logrotate
   logrotate::file { 'indexer.log':
     log     => '/var/log/logstash/indexer.log',
     options => [
diff --git a/manifests/init.pp b/manifests/init.pp
index 3c73ac4..d3d9bca 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -32,11 +32,11 @@ class logstash {
   }
 
   file { '/opt/logstash':
-    ensure   => directory,
-    owner    => 'logstash',
-    group    => 'logstash',
-    mode     => '0644',
-    require  => User['logstash'],
+    ensure  => directory,
+    owner   => 'logstash',
+    group   => 'logstash',
+    mode    => '0644',
+    require => User['logstash'],
   }
 
   exec { 'get_logstash_jar':
diff --git a/manifests/web.pp b/manifests/web.pp
index 267f74d..b4ed460 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -57,7 +57,7 @@ class logstash::web (
     ensure => present,
   }
 
-  include logstash
+  include ::logstash
 
   case $frontend {
     'internal': {
@@ -69,9 +69,9 @@ class logstash::web (
       }
 
       service { 'logstash-web':
-        ensure    => running,
-        enable    => true,
-        require   => [
+        ensure  => running,
+        enable  => true,
+        require => [
           Class['logstash'],
           File['/etc/init/logstash-web.conf'],
         ],
@@ -81,7 +81,7 @@ class logstash::web (
     }
 
     'kibana': {
-      class { 'kibana':
+      class { '::kibana':
         discover_nodes => $discover_nodes,
       }
       $vhost = 'logstash/kibana.vhost.erb'