Awood/package el7

Someone force pushed to master and obliterated this PR which we need to build on RHEL 7.  Resubmitting. :angry: