Merge pull request #185 from rchekaluk/master

Misc build cleanups