Merge install script branch.

Seems to be Good Enough for now, and shouldn't break anything at all to merge this.