Updating Gulp, fixing some scss issues