initial commit
hack in tighter uop integration
tidy
merge
razor compat
tidy
Merge branch 'master' into net40