Merge pull request #346 from psu-stewardship/location

Updating the method signature to match with the latest ActiveResource si...
Changing to carrierwave delete and fixing test to check for deletion