After looking up definitions for both, I don't think I fall into either category. I believe there is a greater being, one greater than any human, but I also believe in evolution. I don't even know if that's a contradiction of beliefs either.
However, the church I attend has REALLY succeeded in turning me off to church and turning me away. The pastor is great, he's always delivered a good message when I've paid attention (that which I don't always do), and he's one of the most compassionate guys you'll ever meet. The congregation is what seems to shove me away. It's quite a conservative Christian audience, but not the wackjobs you find in some places. It's more of a subtle approach, with little sleights and backhanded snipes at each other. I guess I feel like they act condescendingly towards our family, whether it be because we don't attend regularly, AREN'T conservative, or whatnot, but the people of the church have turned me off to Sunday mornings.
What would you say this makes me? Again, I think there's a higher being, be it Jesus, God, Buddha, Allah, etc. etc. Maybe it just makes me an uptight prick, but I'm not sold on JUST Christianity, I understand there are other religions and viewpoints out there.