Addressing comments
Addressing comments
Merge branch 'master' of https://github.com/qiime/qiime into join_pair_one_file
Merge branch 'master' of github.com:antgonza/qiime into join_pair_one_file
Merge branch 'master' of https://github.com/qiime/qiime into join_pair_one_file
Merge branch 'master' of https://github.com/qiime/qiime into join_pair_one_file
Merge branch 'master' of https://github.com/qiime/qiime into join_pair_one_file
addressing @gregcaporaso comments
Merge pull request #1365 from antgonza/join_pair_one_file

Join pair ends from one file