It is very easy to consider 'peace making' and peace keeping' to be the same thing. After all, both terms have the word 'peace' at their root. However, in praxtice, both terms have different associations and uses.
'Peace making' sounds very active and implies actually doing something to create and maintain the state of peace. It even could be considered agressive. But in practice, this could not be further from the truth. Peace makers are those who try to bring about peace, but usually in ways that are peaceful in and of themselves. Organizing peace marches, teach-ins, rallies, or even forms of civil disobedience.
'Peace keeping' has an ironic twist to it, because those who are officially peace keepers generally carry weapons and may even be involved with the military. However, when done properly, peace keeping can be an effective and necessary part of bringing about peace in a war-torn region.
The Canadian mission in Afghanistan has been referred to as both 'peace keeping' and 'peace making.' 'Keeping,' through their presence, and 'making' through their advances (many of which use violence). Neither terms is correct in this instance. What is happening in Afghanistan is a military occupation to try to force into power a US-style system of government.
'Peace making' is a much more general term. Everyone can be a peace maker in his or her own way, through small gestures, or through large actions. Not everyone can be a rally organizer, but everyone can make decisions about boycotting certain products (such as those which cause misery for those in other countries) and choosing Fair Trade coffee and chocolate, as one example.
'Peace keeping' is an active term in its own way, but one most specific to physical peace keeping, the irony of which being that it can sometimes become violent. Sometimes, it doesn't even have any effect at all. The U.N. is probably the world's most well-known peace keeping organization, but its effectiveness has at times been questioned.
So, when it comes to regular, every day people who want to make a difference in the world, 'peace maker' is the best description. In the words of Jesus, it is the peace makers who will be called children of G-d. Peace keeping has its place, of course, but it is a much more specialized kind of service. However, for a focus on grassroots activism, both individually and in groups, peace making is the way to go.