diff --git a/.gitignore b/.gitignore
index 997ca2f..06d1a3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-.vagrant
\ No newline at end of file
+.vagrant
+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/application.pp b/manifests/application.pp
index de2a191..a0b3adf 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -67,15 +67,15 @@ class storyboard::application (
   }
 
   # Dependencies
-  require storyboard::params
+  require ::storyboard::params
   include ::httpd
   include ::httpd::mod::wsgi
 
-  class { 'python':
+  class { '::python':
     pip => true,
     dev => true,
   }
-  include python::install
+  include ::python::install
 
   if !defined(Package['git']) {
     package { 'git':
diff --git a/manifests/load_projects.pp b/manifests/load_projects.pp
index f9bec3e..940a295 100644
--- a/manifests/load_projects.pp
+++ b/manifests/load_projects.pp
@@ -29,8 +29,8 @@ class storyboard::load_projects (
   $source,
 ) {
 
-  include storyboard::params
-  include storyboard::application
+  include ::storyboard::params
+  include ::storyboard::application
 
   $project_file_path = '/var/lib/storyboard/projects.yaml'
 
@@ -42,7 +42,7 @@ class storyboard::load_projects (
     source  => $source,
     replace => true,
     require => [
-      Class['storyboard::application'],
+      Class['::storyboard::application'],
     ]
   }
 
@@ -53,4 +53,4 @@ class storyboard::load_projects (
     subscribe   => File[$project_file_path],
     require     => File[$project_file_path],
   }
-}
\ No newline at end of file
+}
diff --git a/manifests/load_superusers.pp b/manifests/load_superusers.pp
index 6c563a2..bbeadb4 100644
--- a/manifests/load_superusers.pp
+++ b/manifests/load_superusers.pp
@@ -25,8 +25,8 @@ class storyboard::load_superusers (
   $source,
 ) {
 
-  include storyboard::params
-  include storyboard::application
+  include ::storyboard::params
+  include ::storyboard::application
 
   $superuser_file_path = '/var/lib/storyboard/superusers.yaml'
 
@@ -38,7 +38,7 @@ class storyboard::load_superusers (
     source  => $source,
     replace => true,
     require => [
-      Class['storyboard::application'],
+      Class['::storyboard::application'],
     ]
   }
 
@@ -49,4 +49,4 @@ class storyboard::load_superusers (
     subscribe   => File[$superuser_file_path],
     require     => File[$superuser_file_path],
   }
-}
\ No newline at end of file
+}
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 0443648..187fd50 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -24,7 +24,7 @@ class storyboard::mysql (
 ) {
 
   # Install MySQL
-  include mysql::server
+  include ::mysql::server
 
   # Add the storyboard database.
   mysql::db { $mysql_database:
@@ -33,4 +33,4 @@ class storyboard::mysql (
     host     => 'localhost',
     grant    => ['all'],
   }
-}
\ No newline at end of file
+}
diff --git a/manifests/rabbit.pp b/manifests/rabbit.pp
index 8167932..f521dc0 100644
--- a/manifests/rabbit.pp
+++ b/manifests/rabbit.pp
@@ -23,9 +23,9 @@ class storyboard::rabbit (
   $rabbitmq_user_password
 ) {
 
-  require storyboard::params
+  require ::storyboard::params
 
-  class { 'rabbitmq':
+  class { '::rabbitmq':
     service_manage    => true,
     delete_guest_user => true,
     manage_repos      => $storyboard::params::manage_rabbit_repo,
diff --git a/manifests/workers.pp b/manifests/workers.pp
index 394b1a7..af0c922 100644
--- a/manifests/workers.pp
+++ b/manifests/workers.pp
@@ -21,7 +21,7 @@ class storyboard::workers (
   $use_upstart = false,
 ) {
 
-  include storyboard::params
+  include ::storyboard::params
 
   $upstart_path = '/etc/init/storyboard-workers.conf'
   $sysvinit_path = '/etc/init.d/storyboard-workers'
@@ -64,4 +64,4 @@ class storyboard::workers (
       Class['::storyboard::application']
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/vagrant.pp b/vagrant.pp
index 8e88e80..5add5f7 100644
--- a/vagrant.pp
+++ b/vagrant.pp
@@ -1,5 +1,5 @@
 node 'puppet-storyboard-precise64' {
-  class { 'storyboard':
+  class { '::storyboard':
     mysql_user_password    => 'storyboard',
     rabbitmq_user_password => 'storyboard',
     hostname               => '192.168.99.22',
@@ -11,7 +11,7 @@ node 'puppet-storyboard-precise64' {
 }
 
 node 'puppet-storyboard-trusty64' {
-  class { 'storyboard':
+  class { '::storyboard':
     mysql_user_password    => 'storyboard',
     rabbitmq_user_password => 'storyboard',
     hostname               => '192.168.99.23',
@@ -20,4 +20,4 @@ node 'puppet-storyboard-trusty64' {
       '192.168.99.23'
     ],
   }
-}
\ No newline at end of file
+}