correct convention for Provisioner rspec test
Merge branch 'make_launch_script_data_driven' of github.com:alphagov/vcloud-tools into make_launch_script_data_driven
correct bugs relating to content_types
using github.com/fog/fog master branch for now, was causing issues with bundle install
improve gitignore to skip vim swp files and vendor
refactor add_extra_disks

* shifted code for loading vdc handling into the fog_interface
* added vapp.vdc method to get vdc from vApp
* dependency injected vapp into VM to get vDC for extra disks addition