Removing merge commit issues
Fog SSH settings have changed since committed...

Kept getting 

```
/Users/peterso/Projects/vagrant-rackspace/lib/vagrant-rackspace/action/pre_provision_script.rb:25:in `read': no implicit conversion of Array into String (TypeError)
  from /Users/peterso/Projects/vagrant-rackspace/lib/vagrant-rackspace/action/pre_provision_script.rb:25:in `call'
  from /opt/rubies/2.0.0-p451/lib/ruby/gems/2.0.0/bundler/gems/vagrant-efd1d5e11bfc/lib/vagrant/action/warden.rb:34:in `call'
```