The same thing happened to me on a Trek FX 7.5 - a clicking in the bottom-bracket. Or so it sounded. This, too, was diagnosed as chain-wear. It only had about 200 miles on it. It was a Shimano chain. I couldn't believe it when I brought it in under warranty, and the chain diagnosis was made. The LBS said they'd been seeing a lot of this lately (June). Put on a SRAM. Clicking gone and never came back.