one more try at sass ignore
Merge branch 'master' into gh-pages