Merge pull request #107 from open-cloud/reconcile_openstack

replaces all occurrences of "{S,s}liver{s,}" with {I,i}nstance{s,}