Merge pull request #306 from bmjen/re-refactor-2.0
re-refactor of concat to not depend on file_concat