Apply fixes for building on Fedora 20 and RHEL7.
Merge pull request #513 from bbockelm/rhel7_packaging

Apply fixes for building on Fedora 20 and RHEL7.