tests pass
scripts and library code
address pep8 comments
dealing with test errors
dealing with merge conflicts
Merge branch 'master' of https://github.com/qiime/qiime into testremove
closing fd
dealing with merge conflicts
change varriable name
adressing comments
Merge pull request #1430 from teravest/testremove

Remove get_tmp_filename