[vsphere] add list_templates function
[vsphere] add get_template function
Vsphere: add options of numCPUs and memoryMB for VM clone
Fog::Model#wait_for: eliminate inner retry loop

AWS frequently takes more than 3 seconds for an instance to appear.
Rather than having the overlapping timeouts for reload and
instance_eval, simply make them both occur with the same timeout.

 + Prevents spurious failures when waiting for AMI
 + Easier to follow flow
[openstack] Retrieve supported API version for Image & Network services
[openstack|compute] Add volume attachment methods
Updated gem spec to require json rather than multi_json; Fog::JSON will attempt to load and use multi_json first and then fallback to require json; removed hard coded references to multi_json
Merge branch 'master' of github.com:fog/fog into json_lib
Adding multi_json to GemFile as it is now an optional dependency for the gem
Added tests for Fog::JSON; Added Fog::JSON::LoadError class; Updated all MultiJson references to Fog::JSON
Merge branch 'master' of github.com:fog/fog into json_lib
[core] fixing brittle json test
[openstack|compute] Add volume method to server model
[openstack|compute] Add volume tests
add trademark notice
Revert "add trademark notice"

This reverts commit 8820821c654888065988dadd02e9e6add4a15aba.
Fix CHANGELOG fog version for digitalocean, xenserver and openstack
Merge pull request #1738 from rubiojr/changelog-fixes

Fix CHANGELOG fog version for digitalocean, xenserver and openstack
Merge pull request #1705 from frodenas/openstack_volumes

[openstack|compute] Add volume attachment methods
[vsphere|compute] fix incorrect filters.merge in networks model