Fix grunt connect and watch task