Track column numbers
Merge pull request #3077 from CyberShadow/columns

Track column numbers, add `-columns` to display them in diagnostics