Correct the remove sample dir unit test method to not die if the same directory is configured twice.
Merge remote branch 'upstream/master'
Merge pull request #302 from emilyhahn/master

Fix remove sample dirs in unit_test to not fail on removing a directory multiple times