CEF 2056 and x86/x64 build matrix

Formatting is a little out, which I think is actually my fault, from previous commits, `notepad++` doesn't seem to like the mix of tabs/spaces. Need to clean this up.