Updated to better support OS X and have seperated variables per OS/release and combined some configurations to allow more granualar configuration