Also I would highly recommend staying away from NSAIDS. They have their uses, primarily in certain very acute joint strains and sprains, and even then, only as prescribed by a physician. Do NOT self medicate with ibuprofen. Inflammation is best treated through ice massage (as was mentioned earlier) and diet.
I have two clients from totally different backgrounds. One had an extremely bad ankle sprain several months ago. Bad enough to where it still isn't 100%. The other had tendinitis in this hand for about 5 months. Basically hurt to do anything. Both went to the doctor for advice and help, both took their advice. Fast forward 3 months, still loads of pain. They finally take all grains and starches out of their diet and supplement with fish oil (not even as high of a dose as I recommended) and in 10 days, there was a very noticeable improvement in every way of measuring joint health.
Restricting what you eat may suck, but the thing is, most of us feel like crap every single day of our lives and never even realize it because we have no point of reference. Try it for 2 weeks...strict paleo with fish oil. I literally guarantee you see a large improvement. I'd recommend starting a food journal recording everything you eat and drink. If you'd like feedback off of it, feel free to email it to me.