Modify behaviour of remove and add vmdk to support some edge cases

These commits add the capability to do a regex match on the datastore we are adding a file from.

Also add the datastore as an argument to the removeVMDK function as it's possible to have two files with the same name from different datastores.