Added DS_store and .sass-cache
Fixed sass-cache exclusion
Merge branch 'master' into test