Merge pull request #45 from mcnewton/build-tidy