Refactoring the build process
Merge pull request #1027 from wibblymat/tidying

Refactoring the build process