In a Mexican molcajete (or a medium- sized bowl), mash onion, 1 tablespoon cilantro, jalapeno and salt until smooth and juicy. Add avocado, and mash slightly (avocado should remain somewhat chunky). Stir in tomato and remaining 2 teaspoons cilantro. Season with salt, if desired. Serve immediately.