Updating to match Final Branch

Updating installer to match "Final" branch of other repository.

Also converting indent tabs to spaces.