Faith (my own personal definition) = "I believe that I'm a part of something greater and that I should act in such a way as to make the world around me better for everyone
Religion (my own definition) = "Here are a set of rules to live by. These are the correct rules. People who live by different rules are wrong. They should be made to follow our rules."
If the world had more faith and less religion, I think it would be a much better place to live.