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 fcb1f9f..93ffaf0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -79,9 +79,9 @@ class drupal (
   $site_ssl_cert_file_contents = undef,
   $site_ssl_key_file_contents = undef,
   $site_ssl_chain_file_contents = undef,
-  $site_ssl_cert_file = '',
-  $site_ssl_key_file = '',
-  $site_ssl_chain_file = '',
+  $site_ssl_cert_file = undef,
+  $site_ssl_key_file = undef,
+  $site_ssl_chain_file = undef,
   $package_repository = undef,
   $package_branch = undef,
   $conf = undef,
@@ -90,7 +90,7 @@ class drupal (
   $conf_openid_provider = undef,
 ) {
   include ::httpd
-  include pear
+  include ::pear
 
   # ssl certificates
   if $site_ssl_enabled == true {
@@ -207,10 +207,10 @@ class drupal (
   # drush site-alias definition
 
   file { '/etc/drush':
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
   }
 
   file { '/etc/drush/aliases.drushrc.php':
@@ -226,41 +226,41 @@ class drupal (
   # site custom configuration
 
   file { "${site_root}/etc":
-    ensure    => directory,
-    owner     => 'root',
-    group     => 'root',
-    mode      => '0755',
-    require   => File[$site_root],
+    ensure  => directory,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
+    require => File[$site_root],
   }
 
   file { "${site_root}/etc/settings.php":
-    ensure    => file,
-    owner     => 'root',
-    group     => 'root',
-    mode      => '0400',
-    content   => template('drupal/settings.php.erb'),
-    replace   => true,
-    require   => File["${site_root}/etc"],
+    ensure  => file,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0400',
+    content => template('drupal/settings.php.erb'),
+    replace => true,
+    require => File["${site_root}/etc"],
   }
 
   # deploy a site from scratch when site status is 'NOT INSTALLED'
   exec { "sitedeploy-${site_name}":
-    command     => "/usr/bin/drush dsd-init @${site_alias}",
-    logoutput   => true,
-    timeout     => 600,
-    onlyif      => "/usr/bin/drush dsd-status @${site_alias} | /bin/grep -c 'NOT INSTALLED'",
-    require     => [
+    command   => "/usr/bin/drush dsd-init @${site_alias}",
+    logoutput => true,
+    timeout   => 600,
+    onlyif    => "/usr/bin/drush dsd-status @${site_alias} | /bin/grep -c 'NOT INSTALLED'",
+    require   => [
       File['/etc/drush/aliases.drushrc.php'],
       ]
   }
 
   # update the site into a new slot when a remote update available
   exec { "siteupdate-${site_name}":
-    command     => "/usr/bin/drush dsd-update @${site_alias}",
-    logoutput   => true,
-    timeout     => 600,
-    onlyif      => "/usr/bin/drush dsd-status @${site_alias} | /bin/grep -c 'UPDATE'",
-    require     => [
+    command   => "/usr/bin/drush dsd-update @${site_alias}",
+    logoutput => true,
+    timeout   => 600,
+    onlyif    => "/usr/bin/drush dsd-status @${site_alias} | /bin/grep -c 'UPDATE'",
+    require   => [
       File['/etc/drush/aliases.drushrc.php'],
       Exec["sitedeploy-${site_name}"],
       ]