Make sure this works on Fedora as well as RHEL7.
Merge pull request #461 from apenney/fedora-stuff

Make sure this works on Fedora as well as RHEL7.