Keep Site URL Out of Database

Here is the merged version.  Tested in a pure, fresh installation of WordPress.