Updated Gruntfile to allow for server start and watch