In short, marriage as viewed by many is a religious ritual, a commitment between a man and a women before God (or their deity of choice). With this being the general description I find that for the states to be selling marriage licenses being the state participating and maybe even taxing a religious ceremony.
I propose that all current marriages get recognized on a federal and state level as civil unions. Civil unions are between two consenting adults regardless of sex. If you have a ceremony or celebration of that civil union call it what you will, but as far as the government is concerned there is no marriage, just civil unions. Let's honor the constitution and keep church and state separated.