I plan to visit China in November 2014

I plan to visit China for about seven days during November. I will going from Thailand to China and I am an American citizen with a valid US passport. Do I need to get a visa to travel in China for that period? I live in Texas and can go to Houston to the Chinese Consulate there. If it is required how long does it take to get one?

Thanks