Getting mixed signals...after he's told me no.

I posted a while ago about this guy. This guy pretty much toyed with me, saying that he liked me, lead me on, and then told me he was going to pretend to be straight. I grew apart from him on purpose to help reduce my time with him because he hurt me. I guess he figured it out and got mad at me, and he was annoyed at first, and we then we settled into this nice but awkward peace between us. We were merely civil towards each other. He would always talk about how straight he was and stuff and how macho he was. And now he's growing affectionate to me again. Very slightly but surely.At least I think so. I guess he could just be trying to mend our friendship, but the other day he covered my eyes and shook my head around (in a nice, friendly, teasingly manner, I know how it sounds) when I was at the computer and then he started talking to me on facebook when he heard I was going to go clothe shopping saying "here's a good store." I don't know what to think. Help?

*And the reason why I wanted to grow apart from him was his rejection made me feel horrible for a while, which I guess is selfish and petty, but I didn't know what else to do.