Wiz,
You might have popped the joint when you felt it the first time...NSAIDS for the inflammation and resting the joint by not grinding your teeth, chewing too much, etc might help it heal more quickly.
Make sure you don't grind your teeth at night...that's where most TMJ begins. I had a nightguard made when I began getting it; my DS32 has major grinding problems, and he wears both upper and lower guards at night.

Hope you feel better soon