Moved OSX specific config out of main .conf file, then some cleanup...