The Gospel and Discipleship

What exactly is discipleship? Is the dichotomy often suggested between evangelism and discipleship helpful or hurtful to our understanding of the Great Commission? What should "making disciples" look like for us today?