Adding manual hacks to hmmer, fixes to pbzip2