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/init.pp b/manifests/init.pp
index 8688942..9807e9a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -37,7 +37,7 @@ class nodepool (
 ) {
 
 
-  class { 'mysql::server':
+  class { '::mysql::server':
     config_hash => {
       'root_password'  => $mysql_root_password,
       'default_engine' => 'InnoDB',
@@ -45,8 +45,8 @@ class nodepool (
     }
   }
 
-  include mysql::server::account_security
-  include mysql::python
+  include ::mysql::server::account_security
+  include ::mysql::python
 
   mysql::db { 'nodepool':
     user     => 'nodepool',
@@ -102,9 +102,9 @@ class nodepool (
     source   => $git_source_repo,
   }
 
-  include diskimage_builder
+  include ::diskimage_builder
 
-  include pip
+  include ::pip
   exec { 'install_nodepool' :
     command     => 'pip install -U /opt/nodepool',
     path        => '/usr/local/bin:/usr/bin:/bin/',
@@ -280,11 +280,11 @@ class nodepool (
 
   if $image_log_document_root != '/var/log/nodepool' {
     file { $image_log_document_root:
-      ensure   => directory,
-      mode     => '0755',
-      owner    => 'nodepool',
-      group    => 'nodepool',
-      require  => [
+      ensure  => directory,
+      mode    => '0755',
+      owner   => 'nodepool',
+      group   => 'nodepool',
+      require => [
         User['nodepool'],
         File['/var/log/nodepool'],
       ],