Merge pull request #4 from KwaMoja/develop

Develop
Ensure variables are set before you use them, and remove redundant code
Fix installer error
David Lynn: added url to suppliers
Improvements to layout
Merge pull request #262 from timschofield/develop

Develop