fix #624
removing key when pass change is done and fixing templates
fixing flake8
Merge branch 'master' of https://github.com/biocore/qiita into issue_624
addressing @adamrp comments
addressing @ElDeveloper comments
Merge pull request #628 from antgonza/issue_624

Issue 624