Pacifism vs. non-violence

Over the last couple of years, I've been on a spiritual journey of sorts. I read a book with a guy when I was living in Pekin that challenged me in regards to my stance about war and violence. So, in the past couple years, I've started to label myself an "almost pacifist." Really, I would have to say that I probably still believe in "just-war theory," but that's a discussion for another time. Here's the point of the post. Over the last couple of days I've been listening to the Mars Hill podcast, specifically the series, "Calling all Peacemakers," and something (I don't know if Rob Bell actually said it or not), became clear in my mind: the difference between pacifism & non-violence). "Pacifism" as a term hasn't really settled with me because, when I think of "pacifism," I think of non-involvement -- of disengagement. "Non-violence," however suggest that there are things I should "fight for" but always on the principle of non-violence. Sorry...I don't have time to say more here...but if you have questions, please leave them in the comments and I'll try to respond.