Annotation table

This release adds the possibility to merge the table with an annotation table, specified with --annottable.

It also adds --qfromfname that overwrites the query name in the file with the name of the result file minus .tblout. This is to make it easier to create a score file from e.g. Pfam hmm files without having to translate from accession to full name.