Updated to compile in sass 3.3.9
Merge branch 'master' into gh-pages