FIX: When concatenating the files, don't trim unnecessary returns

Fixes #122.

I also removed some extra new lines in the concatenated file to make formatting a little nicer.