Checking in a common version of settings.txt so that we can converge on setting keys.  Fixed my sloppy bwa.py (I hope) and began samtools.py