Column support (closes #4904)
Merge pull request #4096 from aeslaughter/columns-4094

Column support
.gitignore update for new revision headers
refs #4070
Skipping bad test
refs #3949
Merge commit '895519294aa17602e06cb2ca7e8be4989d8fe15f'
Merge commit '6a54378b55ebba50642280bc8f6d4ac550838b92'