fixing a minor bug ('Sun' in RHEL6u5 uname -a output was throwing us off), adding TODO about proper future handling