minor tweaks to generator and scanner edge cases
remove activesupport from Gemfile
Merge branch 'master' into sass-scanner