diff --git a/.gitignore b/.gitignore
index 80da1cde..ac3eac03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-*.gem
-.zero-knife.rb
 *.rbc
-.bundle
 .config
 coverage
 InstalledFiles
@@ -12,7 +9,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-Gemfile.lock
 _Store
 *~
 *#
@@ -23,9 +19,14 @@ _Store
 *.tmp
 *.bk
 *.bkup
+
+# ruby/bundler files
 .ruby-version
 .ruby-gemset
 .rvmrc
+Gemfile.lock
+.bundle
+*.gem
 
 # YARD artifacts
 .yardoc
@@ -39,6 +40,7 @@ Berksfile.lock
 .kitchen.local.yml
 vendor/
 .coverage/
+.zero-knife.rb
 
 #vagrant stuff
 .vagrant/
diff --git a/.kitchen.cloud.yml b/.kitchen.cloud.yml
index 4aa510fc..ef008201 100644
--- a/.kitchen.cloud.yml
+++ b/.kitchen.cloud.yml
@@ -7,7 +7,6 @@ driver_config:
 
 provisioner:
   name: chef_zero
-  require_chef_omnibus: 11.16.0
 
 platforms:
 - name: amazon-2014.09
diff --git a/.rubocop.yml b/.rubocop.yml
index 82752d55..8e272d2f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   Exclude:
     - vendor/**/*
@@ -29,15 +31,3 @@ Style/ClassAndModuleChildren:
   Enabled: false
 Style/FileName:
   Enabled: false
-
-# Todo:  These should are non-standard rubocop rules were should investigate and resolve
-Style/ClassVars:
-  Enabled: false
-Metrics/ParameterLists:
-  Enabled: false
-Lint/Loop:
-  Enabled: false
-Style/UnlessElse:
-  Enabled: false
-Lint/UselessAssignment:
-  Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 00000000..393c5984
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,35 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-11-24 19:37:18 -0800 using RuboCop version 0.35.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Lint/Loop:
+  Exclude:
+    - 'providers/ebs_raid.rb'
+
+# Offense count: 4
+Lint/UselessAssignment:
+  Exclude:
+    - 'libraries/ec2.rb'
+
+# Offense count: 4
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 15
+
+# Offense count: 5
+Style/ClassVars:
+  Exclude:
+    - 'libraries/ec2.rb'
+    - 'libraries/elb.rb'
+    - 'libraries/s3.rb'
+
+# Offense count: 8
+Style/UnlessElse:
+  Exclude:
+    - 'providers/elastic_lb.rb'
+    - 'providers/resource_tag.rb'
diff --git a/Gemfile b/Gemfile
index 3653c3c7..acd4b6f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,5 @@ group :kitchen_vagrant do
 end
 
 group :kitchen_cloud do
-  gem 'kitchen-digitalocean'
   gem 'kitchen-ec2'
 end
diff --git a/chefignore b/chefignore
index 75d2251b..a9769175 100644
--- a/chefignore
+++ b/chefignore
@@ -1,5 +1,5 @@
 # Put files/directories that should be ignored in this file when uploading
-# or sharing to the community site.
+# to a chef-server or supermarket.
 # Lines that start with '# ' are comments.
 
 # OS generated files #
@@ -54,8 +54,13 @@ features/*
 examples/*
 Guardfile
 Procfile
-test/*
+.kitchen*
+.rubocop.yml
 spec/*
+Rakefile
+.travis.yml
+.foodcritic
+.codeclimate.yml
 
 # SCM #
 #######
@@ -79,8 +84,10 @@ tmp
 
 # Cookbooks #
 #############
-CONTRIBUTING
+CONTRIBUTING*
 CHANGELOG*
+TESTING*
+MAINTAINERS.toml
 
 # Strainer #
 ############
@@ -93,7 +100,3 @@ Strainerfile
 ###########
 .vagrant
 Vagrantfile
-
-# Travis #
-##########
-.travis.yml