Merge pull request #60 from cloudfoundry-community/upgrades

Upgrades
Replacing deprecated #mock with #instance_double
Newer rspec syntax
WIP towards neutron support