It's not a straight continuum from peaceful
jihad in the past to violent
jihad today, though. Early Islam expanded greatly through conquest (
http://en.wikipedia.org/wiki/Islamic_conquests), establishing much of what we today consider the Muslim world. Islamic jurisprudence eventually regularized the practice of conquest by establishing the division of the world between the
Dar al-Islam ("house of Islam"), countries which had adopted Islam and were therefore not to war against each other, and the
Dar al-Harb ("house of war"), countries that had not adopted Islam and were therefore fair game. (
http://en.wikipedia.org/wiki/Divisions_of_the_world_in_Islam...)
None of which is to say that Islam is an inherently violent religion; just that it historically has oscillated back and forth between peace-seeking and external aggression, rather than starting as one and coming today to be the other. (Which is not an uncommon thing; Western Christianity has done much the same, with Crusades and Inquisitions flaming up and dying off as militancy in that faith waxed and waned.)