Add *.DS_Store to .gitignore
Merge branch 'mikedias-patch-1'

Fixes #675