Cleanup installer code, and bring into line with the KwaMoja coding guidelines
Merge pull request #219 from timschofield/develop

Cleanup installer code, and bring into line with the KwaMoja coding guid...