bug fix and updated to handle different versions of QIIME (1.5 - 1.7)
fix merge conflict
Merge pull request #7 from teharrison/master

bug fix and updated to handle different versions of QIIME (1.5 - 1.7)