Merge pull request #88 from bphinz/buildfixes

Fixes for rpm-based distro builds