Merge branch 'master' of https://github.com/biocore/qiita into adding-qiime-map-file
Fixing bug 676
wip: adding create_qiime_map
Merge branch 'master' of https://github.com/biocore/qiita into adding-qiime-map-file
Merge branch 'issue-676' of https://github.com/josenavas/qiita into adding-qiime-map-file
adding qiime mapping file
fixing flake8
fixing errors
fixing errors due to table insert
fix flake8, again
adding test for create_qiime_map
Merge pull request #677 from josenavas/issue-676

BUG: fixes #676
Merge branch 'master' of https://github.com/biocore/qiita into adding-qiime-map-file
addressing @ElDeveloper commenets
addressing @josenavas comments
Merge pull request #678 from antgonza/adding-qiime-map-file

Adding qiime map file