Ignore .DS_Store.
Merge from origin/master.
Merge branch 'master' of https://github.com/civic-commons/opencivic