fixed compiling on OS X - cpuid seems to work fine with clang
Merge remote-tracking branch 'dominus/master'