Do not track .DS_Store and add it to the ignore file
Merge branch 'master' into gh-pages