Updated the Windows installation and setup instructions to be for Windows 7. Merged the two-parts into one.