More tweaks to installer.
Merge pull request #7 from galthaus/install-tools

More tweaks to installer.