Misc. changes
manually resolving merge
Combined runs at different levels of sequence identity
merging peter's latest version