Strip foreign tags instead of skipping files
Merge branch 'master' into mac

Conflicts:
	tools/wordlistfromperseus.sh