Merge fish config into single file.

Not enough content in any of the files
to make the pain of managing different files
worthwhile.