Mafft integration

Integrate Julie's fixes and allow for using either mafft or muscle as the aligner.