Adding new option 'blast_db' and fixing parallel_blast.py
Fixing typo
Added comment about parallel_blast.py interface change on ChangeLog.md
Merge QIIME master
Fixing merge conflict on ChangeLog.md
Merge pull request #912 from josenavas/blast_db_option

Adding new option 'blast_db' and fixing parallel_blast.py