Update, and fix for OSX, logic around determining vendor, distribution, and release.