Fixed installer issues.

Fixed up a bunch of installer issues that kept the 1.6.0 copy from
installing cleanly.