improve .gitignore, closing (#75)

remove duplicate .DS_Store line,
ignore .orig files generated by git conflicts
I am just pushing this without review since it is trivial