Fixed grunt watch and more cleanup