Merge mpileup test fix: Remove temporary hack, view -C -T now works

(Fix the fix: BSD and POSIX getopt() require options to appear before
non-option arguments.)