Merge column-major branch to master

The column-major experiment seems to be working out, so merge it back to master.