Merge pull request #142 from bphinz/master

Updates to package builds