diff --git a/Gemfile b/Gemfile
index c6e89ad..c3be1d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ if ENV['USER'] != 'vagrant'
 end
 
 group :development do
-  gem 'vagrant', github: 'mitchellh/vagrant'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-inotify'
@@ -15,15 +15,16 @@ end
 
 group :development, :test do
   gem 'rake'
-  # Update https://github.com/fgrehm/vagrant-lxc/issues/111
+  # TODO: Update https://github.com/fgrehm/vagrant-lxc/issues/111
   gem 'rspec',        '2.99.0.beta2'
   gem 'coveralls',    require: false
-  gem 'vagrant-spec', github: 'mitchellh/vagrant-spec'
+  gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git'
 end
 
 group :plugins do
   gem 'vagrant-lxc',      path: '.'
-  gem 'vagrant-cachier',  github: 'fgrehm/vagrant-cachier'
-  gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine'
+  # TODO: Disable these plugins when running acceptance specs
+  gem 'vagrant-cachier',  git: 'https://github.com/fgrehm/vagrant-cachier.git'
+  gem 'vagrant-pristine', git: 'https://github.com/fgrehm/vagrant-pristine.git'
   gem 'vagrant-omnibus'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3b98636..53895ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,17 @@
 GIT
-  remote: git://github.com/fgrehm/vagrant-cachier.git
+  remote: https://github.com/fgrehm/vagrant-cachier.git
   revision: 2df1e319408a7e6f1c6e75d48e36591199e98527
   specs:
     vagrant-cachier (0.6.1.dev)
 
 GIT
-  remote: git://github.com/fgrehm/vagrant-pristine.git
+  remote: https://github.com/fgrehm/vagrant-pristine.git
   revision: 503dbc47848c81d0fbfa6840491856f518d244a1
   specs:
     vagrant-pristine (0.3.0)
 
 GIT
-  remote: git://github.com/mitchellh/vagrant-spec.git
+  remote: https://github.com/mitchellh/vagrant-spec.git
   revision: 4c1bad4b06085c7f1296f8ea66d803a3717ddb00
   specs:
     vagrant-spec (0.0.1)
@@ -21,7 +21,7 @@ GIT
       thor (~> 0.18.1)
 
 GIT
-  remote: git://github.com/mitchellh/vagrant.git
+  remote: https://github.com/mitchellh/vagrant.git
   revision: 240523b1aa9f328c09060cff34a211bd3f93f7ca
   specs:
     vagrant (1.5.1.dev)
diff --git a/lib/vagrant-lxc/driver.rb b/lib/vagrant-lxc/driver.rb
index 3c14554..6f612aa 100644
--- a/lib/vagrant-lxc/driver.rb
+++ b/lib/vagrant-lxc/driver.rb
@@ -87,6 +87,7 @@ module Vagrant
 
       def forced_halt
         @logger.info('Shutting down container...')
+        # TODO: Remove `lxc-shutdown` usage, graceful halt is enough
         @cli.transition_to(:stopped) { |c| c.shutdown }
       # REFACTOR: Do not use exception to control the flow
       rescue CLI::TargetStateNotReached, CLI::ShutdownNotSupported