Re-arrange dependencies to remove duplicates. Attempt to get rid of facter 1.6.18