Swapped htseq_count output to return a sample dictionary.

Added "count_file" as a field to the sample dictionary.