Removed some pointless stuff from the Makefile
Fix the cpuid test to not clobber the high bits of rbx