Exclude .DS_Store within git
Merge branch 'config-git'