Added clean grunt option and tied it to watch too