Merge the Sphinx projects into one.

Should this have RPM in it somewhere. I know it's part of the rpm repo and builder, but I think most users will miss that.