changed the option to have preserve-os-disk with existing test-cases passed.
Removed the unnecessary pry dependency.
Resolve server deletion fixes merge conflicts
Fix merge conflict break
Fixed merging issues, changed the name of a parameter
Merge pull request #28 from opscode/adamed-oc-7777

OC-7777: --purge-os-disk parameter is always true and cannot be set to false