Merge pull request #58 from randy-waterhouse/master

Few small fixes for new build system.