add ignore of DS_store files
Merge branch 'master' into localpoint