Workaround for facter os major version thing

I've tested this in Centos 6.5 and it works. Not sure about an older OS that uses the old fact name, but this should retain the old behavior in that case.
OK, rebased and merged and stuff. Still getting used to git so apologies for the mess of commits.