added grunt watch and build, moved sass back out of app