diff --git a/.gitignore b/.gitignore
index 8291ff5..bee7964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ pkg
 
 .bundle
 
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
 #
 # * Create a file at ~/.gitignore
 # * Include files you want ignored
@@ -48,3 +48,6 @@ Gemfile.lock
 vendor/
 
 homesick*.gem
+
+# rbenv configuration
+.ruby-version
diff --git a/Gemfile b/Gemfile
index 06c94eb..86e1dff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,8 +12,6 @@ group :development do
   gem "guard"
   gem "guard-rspec"
   gem "rb-readline", "~> 0.5.0"
-  gem "jeweler", ">= 1.6.2"
-  gem 'coveralls', require: false
   gem "test_construct"
   gem "capture-output", "~> 1.0.0"
   if RbConfig::CONFIG['host_os'] =~ /linux|freebsd|openbsd|sunos|solaris/
@@ -22,7 +20,13 @@ group :development do
   if RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
     gem 'terminal-notifier-guard', '~> 1.6.1'
   end
-  if RUBY_VERSION >= '1.9.2'
-    gem "rubocop"
+  gem "coveralls", require: false
+  gem "rubocop"
+  if RUBY_VERSION < '2.3.0'
+    gem "rack", "< 2"
+    gem "listen", "< 3"
+    gem "jeweler", ">= 1.6.2", "< 2.2"
+  else
+    gem "jeweler", ">= 1.6.2"
   end
 end
diff --git a/lib/homesick/cli.rb b/lib/homesick/cli.rb
index c82f34a..159d470 100644
--- a/lib/homesick/cli.rb
+++ b/lib/homesick/cli.rb
@@ -66,6 +66,7 @@ module Homesick
 
     desc 'rc CASTLE', 'Run the .homesickrc for the specified castle'
     method_option :force,
+                  type: :boolean,
                   default: false,
                   desc: 'Evaluate .homesickrc without prompting.'
     def rc(name = DEFAULT_CASTLE_NAME)
@@ -128,6 +129,7 @@ module Homesick
 
     desc 'link CASTLE', 'Symlinks all dotfiles from the specified castle'
     method_option :force,
+                  type: :boolean,
                   default: false,
                   desc: 'Overwrite existing conflicting symlinks without prompting.'
     def link(name = DEFAULT_CASTLE_NAME)