Sass cleanup, grunt watch fix