make sure folder / filenames are string, not unicode
merge .gitignore