Changed data path and cleanup
Junit: Change path
Add Junit test
Merge pull request #14 from arx-deidentifier/master

Merge from master repository