Merge pull request #325 from billhollings/master

 Refactor the build environment.