Add any .sass-cache directories
Merge branch 'master' into production