Fix for Issue #13 - Fedora tests are "bad"

There were syntax errors, but
Checking for the OS is not the right thing to do :)

Instead, I changed the code to check to see if it should call one or the other.
Merge branch 'issue-13-fedora' into spec-rhel5
Added hack to attempt to import daemon from 2.4