Replaced "Windows 7"/"Windows 8" with "windows" osfamily for Windows versions other than 7/8 and replace "Linux"/"Mac OS X" with "unix" osfamily for Unix OSes that aren't Linux/Mac.
Added in support for auto-incrementing build numbers into the build script (and code). A nicer way to track what version folks have :)