diff --git a/.markdownlint-cli2.jsonc b/.markdownlint-cli2.jsonc
new file mode 100644
index 0000000..a43b612
--- /dev/null
+++ b/.markdownlint-cli2.jsonc
@@ -0,0 +1,7 @@
+{
+  "fix": false,
+  "globs": ["**/*.md", "!vendor"],
+//   "ignores": ["ignore*.md"],
+  "noProgress": false,
+  "showFound": true
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a70f0cc..c01a2bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+# busser-bats Changelog
+
 ## 0.3.0 / 2014-10-14
 
 ### New features
@@ -22,4 +24,4 @@
 * Initial release
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
-[@fnichol]: https://github.com/fnichol
\ No newline at end of file
+[@fnichol]: https://github.com/fnichol
diff --git a/Gemfile b/Gemfile
index d936691..78f03a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,16 +16,12 @@ end
 group :development do
   gem "aruba"
   gem "countloc"
-#   gem "rake"
   gem "simplecov"
 
-  # style and complexity libraries are tightly version pinned as newer releases
-  # may introduce new and undesireable style choices which would be immediately
-  # enforced in CI
-  gem "finstyle",  "1.2.0"
+#   gem "finstyle",  "1.2.0"
   gem "cane",      "2.6.2"
 end
 
-# group :chefstyle do
-#   gem "chefstyle", "2.2.3"
-# end
+group :chefstyle do
+  gem "chefstyle", "2.2.3"
+end
diff --git a/README.md b/README.md
index 161edb5..6d22e31 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# <a name="title"></a> Busser::RunnerPlugin::Bats
+# Busser::RunnerPlugin::Bats
 
 [![Gem Version](https://badge.fury.io/rb/busser-bats.png)](http://badge.fury.io/rb/busser-bats)
 [![Build Status](https://travis-ci.org/test-kitchen/busser-bats.png?branch=master)](https://travis-ci.org/test-kitchen/busser-bats)
@@ -10,15 +10,15 @@ A Busser runner plugin for [Bats][bats_site]
 
 This software project is no longer under active development as it has no active maintainers. The software may continue to work for some or all use cases, but issues filed in GitHub will most likely not be triaged. If a new maintainer is interested in working on this project please come chat with us in #test-kitchen on Chef Community Slack.
 
-## <a name="installation"></a> Installation and Setup
+## Installation and Setup
 
 Until proper reference documentation is complete, the [Writing a Test](http://kitchen.ci/docs/getting-started/writing-test) section of the Test Kitchen's [Getting Started Guide](http://kitchen.ci/docs/getting-started/) gives a working example of creating a bats test.
 
-## <a name="usage"></a> Usage
+## Usage
 
 **TODO:** Write documentation explaining the structure/format of testing files.
 
-## <a name="development"></a> Development
+## Development
 
 * Source hosted at [GitHub][repo]
 * Report issues/questions/feature requests on [GitHub Issues][issues]
@@ -33,11 +33,11 @@ example:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## <a name="authors"></a> Authors
+## Authors
 
 Created and maintained by [Fletcher Nichol][author] (<fnichol@nichol.ca>)
 
-## <a name="license"></a> License
+## License
 
 Apache 2.0 (see [LICENSE][license])
 
@@ -48,6 +48,5 @@ Apache 2.0 (see [LICENSE][license])
 [issues]:           https://github.com/fnichol/busser-bats/issues
 [license]:          https://github.com/fnichol/busser-bats/blob/master/LICENSE
 [repo]:             https://github.com/fnichol/busser-bats
-[plugin_usage]:     http://docs.kitchen-ci.org/busser/plugin-usage
 
 [bats_site]:  https://github.com/sstephenson/bats
diff --git a/features/plugin_install_command.feature b/config/features/plugin_install_command.feature
similarity index 100%
rename from features/plugin_install_command.feature
rename to config/features/plugin_install_command.feature
diff --git a/features/plugin_list_command.feature b/config/features/plugin_list_command.feature
similarity index 100%
rename from features/plugin_list_command.feature
rename to config/features/plugin_list_command.feature
diff --git a/features/support/env.rb b/config/features/support/env.rb
similarity index 100%
rename from features/support/env.rb
rename to config/features/support/env.rb
diff --git a/features/test_command.feature b/config/features/test_command.feature
similarity index 100%
rename from features/test_command.feature
rename to config/features/test_command.feature
diff --git a/lib/busser/bats/version.rb b/lib/busser/bats/version.rb
index 6773f66..edf3668 100644
--- a/lib/busser/bats/version.rb
+++ b/lib/busser/bats/version.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -21,6 +20,6 @@ module Busser
   module Bats
 
     # Version string for the Bats Busser runner plugin
-    VERSION = "0.3.1.dev"
+    VERSION = "0.3.1.dev".freeze
   end
 end
diff --git a/lib/busser/runner_plugin/bats.rb b/lib/busser/runner_plugin/bats.rb
index 952a51a..df9b69b 100644
--- a/lib/busser/runner_plugin/bats.rb
+++ b/lib/busser/runner_plugin/bats.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -16,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "pathname"
+require "pathname" unless defined?(Pathname)
 
 require "busser/runner_plugin"