Properly merge forward_agent and other SSH configs [GH-651]

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 0.9.2 (unreleased)
 
-
+  - Fix `forward_agent` not working when outside of blocks. [GH-651]
 
 ## 0.9.1 (January 18, 2012)
 

config/default.rb

@@ -11,6 +11,7 @@ Vagrant::Config.run do |config|
   config.ssh.timeout = 10
   config.ssh.forward_agent = false
   config.ssh.forward_x11 = false
+  config.ssh.shell = "bash"
 
   config.vm.auto_port_range = (2200..2250)
   config.vm.box_url = nil

lib/vagrant/config/ssh.rb

@@ -13,12 +13,6 @@ module Vagrant
       attr_accessor :forward_x11
       attr_accessor :shell
 
-      def initialize
-        @shell            = "bash"
-        @forward_agent    = false
-        @forward_x11      = false
-      end
-
       def forwarded_port_key=(value)
         raise Errors::DeprecationError, :message => <<-MESSAGE
 `config.ssh.forwarded_port_key` is now gone. You must now use