Digital Camera for Product Photography

[jonmikels]

Good Day and thank you in advance.
As the resident graphics person at a small vitamin company, I have to do a lot of product photography for print and for web. Although I have a good feel for angles and presentation I am by no means a photographer. About 50% of the photos I need to take are of bottles. Imagine taking a picture of a can of tomato sauce for a grocery store flyer.

The other 50% of the time I take pictures of pills which come out just great in the macro mode of my Nikon CoolPix 3100 and print just great when we go to press.

My problem is with the bottles. No matter what I do, the photos I take with the CoolPix yield this monolithic, bulbous, fish eye looking bottle. Put it this way when I bring the image into PS and bring a rule up to the edege of the bottle it is nowhere near square.

I need a camera or a camera with a lens that can take a picture that preserves the "cylindrical" nature of the bottle but has square edges.

Thanks,
Jon