Fix #1092 and Fix #979
Merge branch 'master' of https://github.com/qiime/qiime into issue-1092
Addressing comments
Merge pull request #1179 from antgonza/issue-1092

Fix #1092 and Fix #979