diff --git a/.gitignore b/.gitignore
index 6294cfb..d83b2bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
+Berksfile.lock
 Gemfile.lock
 test/gemfiles/*.lock
-Berksfile.lock
 .kitchen/
 .kitchen.local.yml
 test/docker/
+test/ec2/
 coverage/
 pkg/
 .yardoc/
diff --git a/.travis.yml b/.travis.yml
index 6f30de6..0a6e0e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,8 @@ matrix:
   include:
     - rvm: 2.3.1
       gemfile: test/gemfiles/chef-12.gemfile
+    - rvm: 2.4.1
+      gemfile: test/gemfiles/chef-13.gemfile
     - rvm: 2.1.4
       gemfile: test/gemfiles/chef-12.1.gemfile
     - rvm: 2.1.4
@@ -58,5 +60,7 @@ matrix:
       gemfile: test/gemfiles/chef-12.18.gemfile
     - rvm: 2.3.1
       gemfile: test/gemfiles/chef-12.19.gemfile
+    - rvm: 2.4.1
+      gemfile: test/gemfiles/chef-13.0.gemfile
     - rvm: 2.4.1
       gemfile: test/gemfiles/master.gemfile
diff --git a/.yardopts b/.yardopts
index 38e00ba..be7cdef 100644
--- a/.yardopts
+++ b/.yardopts
@@ -1,4 +1,7 @@
 --plugin classmethods
---markup markdown
+--embed-mixin ClassMethods
 --hide-api private
+--markup markdown
 --hide-void-return
+--tag provides:Provides
+--tag action:Actions
diff --git a/.yo-rc.json b/.yo-rc.json
new file mode 100644
index 0000000..a1ccbcb
--- /dev/null
+++ b/.yo-rc.json
@@ -0,0 +1,7 @@
+{
+  "generator-poise": {
+    "created": true,
+    "name": "poise-application-git",
+    "cookbookName": "application_git"
+  }
+}
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 5aa821f..7c0d5d1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ def dev_gem(name, path: File.join('..', name), github: nil)
   if File.exist?(path)
     gem name, path: path
   elsif github
-    gem name, github: github
+    gem name, git: "https://gitub.com/#{github}.git"
   end
 end
 
diff --git a/test/gemfiles/chef-12.1.gemfile b/test/gemfiles/chef-12.1.gemfile
index c7ace12..170e314 100644
--- a/test/gemfiles/chef-12.1.gemfile
+++ b/test/gemfiles/chef-12.1.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.1.2'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.10.gemfile b/test/gemfiles/chef-12.10.gemfile
index 4e96ed4..a98cfc0 100644
--- a/test/gemfiles/chef-12.10.gemfile
+++ b/test/gemfiles/chef-12.10.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.10.24'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.11.gemfile b/test/gemfiles/chef-12.11.gemfile
index f6f55c6..302cf79 100644
--- a/test/gemfiles/chef-12.11.gemfile
+++ b/test/gemfiles/chef-12.11.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.11.18'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.12.gemfile b/test/gemfiles/chef-12.12.gemfile
index 0b673e4..4724162 100644
--- a/test/gemfiles/chef-12.12.gemfile
+++ b/test/gemfiles/chef-12.12.gemfile
@@ -17,6 +17,6 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.12.15'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
diff --git a/test/gemfiles/chef-12.13.gemfile b/test/gemfiles/chef-12.13.gemfile
index 9cc50eb..67e00b8 100644
--- a/test/gemfiles/chef-12.13.gemfile
+++ b/test/gemfiles/chef-12.13.gemfile
@@ -17,6 +17,6 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.13.37'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
diff --git a/test/gemfiles/chef-12.2.gemfile b/test/gemfiles/chef-12.2.gemfile
index 157048b..3b3d674 100644
--- a/test/gemfiles/chef-12.2.gemfile
+++ b/test/gemfiles/chef-12.2.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.2.1'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.3.gemfile b/test/gemfiles/chef-12.3.gemfile
index 963a1f9..8700b6c 100644
--- a/test/gemfiles/chef-12.3.gemfile
+++ b/test/gemfiles/chef-12.3.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.3.0'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.4.gemfile b/test/gemfiles/chef-12.4.gemfile
index e3a9da2..00fc198 100644
--- a/test/gemfiles/chef-12.4.gemfile
+++ b/test/gemfiles/chef-12.4.gemfile
@@ -17,8 +17,8 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.4.3'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
 gem 'gh', '0.14.0'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.5.gemfile b/test/gemfiles/chef-12.5.gemfile
index 91a0f0d..d0c73a4 100644
--- a/test/gemfiles/chef-12.5.gemfile
+++ b/test/gemfiles/chef-12.5.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.5.1'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.6.gemfile b/test/gemfiles/chef-12.6.gemfile
index 2cf21ed..fdd4417 100644
--- a/test/gemfiles/chef-12.6.gemfile
+++ b/test/gemfiles/chef-12.6.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.6.0'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.7.gemfile b/test/gemfiles/chef-12.7.gemfile
index d9a353c..9c22595 100644
--- a/test/gemfiles/chef-12.7.gemfile
+++ b/test/gemfiles/chef-12.7.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.7.2'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.8.gemfile b/test/gemfiles/chef-12.8.gemfile
index 16834cd..2b390eb 100644
--- a/test/gemfiles/chef-12.8.gemfile
+++ b/test/gemfiles/chef-12.8.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.8.1'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-12.9.gemfile b/test/gemfiles/chef-12.9.gemfile
index 7e4aea3..b67456e 100644
--- a/test/gemfiles/chef-12.9.gemfile
+++ b/test/gemfiles/chef-12.9.gemfile
@@ -17,7 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.9.41'
-gem 'rack', '< 2'
-gem 'foodcritic', '< 8'
-gem 'fauxhai', '<= 3.9.0'
 gem 'chefspec', '< 6'
+gem 'fauxhai', '<= 3.9.0'
+gem 'foodcritic', '< 8'
+gem 'rack', '< 2'
diff --git a/test/gemfiles/chef-13.0.gemfile b/test/gemfiles/chef-13.0.gemfile
new file mode 100644
index 0000000..7e864da
--- /dev/null
+++ b/test/gemfiles/chef-13.0.gemfile
@@ -0,0 +1,19 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 13.0.118'
diff --git a/test/gemfiles/chef-13.gemfile b/test/gemfiles/chef-13.gemfile
new file mode 100644
index 0000000..f7f40e8
--- /dev/null
+++ b/test/gemfiles/chef-13.gemfile
@@ -0,0 +1,19 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 13.0'
diff --git a/test/gemfiles/master.gemfile b/test/gemfiles/master.gemfile
index d8e87aa..8b105d4 100644
--- a/test/gemfiles/master.gemfile
+++ b/test/gemfiles/master.gemfile
@@ -16,12 +16,16 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', github: 'chef/chef'
-gem 'halite', github: 'poise/halite'
-gem 'ohai', github: 'chef/ohai'
-gem 'poise', github: 'poise/poise'
-gem 'poise-application', github: 'poise/application'
-gem 'poise-boiler', github: 'poise/poise-boiler'
-gem 'poise-git', github: 'poise/poise-git'
-gem 'poise-languages', github: 'poise/poise-languages'
-gem 'poise-service', github: 'poise/poise-service'
+gem 'chef', git: 'https://github.com/chef/chef.git'
+gem 'chefspec', git: 'https://github.com/sethvargo/chefspec.git'
+gem 'fauxhai', git: 'https://github.com/customink/fauxhai.git'
+gem 'foodcritic', git: 'https://github.com/foodcritic/foodcritic.git'
+gem 'halite', git: 'https://github.com/poise/halite.git'
+gem 'ohai', git: 'https://github.com/chef/ohai.git'
+gem 'poise', git: 'https://github.com/poise/poise.git'
+gem 'poise-application', git: 'https://github.com/poise/poise-application.git'
+gem 'poise-boiler', git: 'https://github.com/poise/poise-boiler.git'
+gem 'poise-git', git: 'https://github.com/poise/poise-git.git'
+gem 'poise-languages', git: 'https://github.com/poise/poise-languages.git'
+gem 'poise-profiler', git: 'https://github.com/poise/poise-profiler.git'
+gem 'poise-service', git: 'https://github.com/poise/poise-service.git'