Fixing --metrics option type for beta_diversity.py
Merge branch 'master' of github.com:qiime/qiime into beta_diversity
Changing metric_list to metrics and adding tests for string and list cases
Merge pull request #820 from josenavas/beta_diversity

Fixing --metrics option type for beta_diversity.py