Democracy and What Government?

      In my microeconomics class today, we were talking about the ever-present economic debate of markets and government, and how much of each should be involved.  My professor pointed out that it is not a question of "markets or government?", but a question of "markets and what government?"  I thought about this and if there might be a parallel to the Second Great Awakening and the matter of religion in the government.  So the question that comes to my mind is "government and what religion?"
     During the time of the Second Great Awakening, biblical laws became integrated into the actual government law.  It seems to me as though the question of "government and what religion?" was never pondered, because so many people were invested in spiritual revival and wanted to integrate this into the government. But as our country has grown, there has been more and more debate with how our nation is not actually a Christian nation, yet the government runs under some laws that are founded on Christian principles.  For example, the ten commandments have been removed from public schools, and people are asking if "one nation, under God" should actually be part of our pledge of allegiance.  While this does not bother me because I am a Christian, I can understand how individuals of other religions could have a problem with this.  So...how much of the Christian religion should be integrated into the government?  Our founding fathers were Christian, and this is why our government includes Christian principles. Should these principles be kept? As long as our nation continues to be diverse in every aspect -- especially in religion, the question of "government and what (how much) religion?" will be present.  And furthermore, should this be something that citizens get to vote on (democracy!)?