changed deduplication method to Vlad's and removed potholes
Merge branch 'master' of https://github.com/ezubaric/diplomacy