Merge pull request #91 from JTFouquier/travis-error

merge travis error fixes into master

.travis.yml

@@ -2,17 +2,24 @@
 # Check on http://lint.travis-ci.org/ after modifying it!  Originally
 # modified from https://gist.github.com/dan-blanchard/7045057
 language: python
-env:
-  - PYTHON_VERSION=3.5
+python:
+  - "3.5"
+  - "3.6"
 before_install:
   - wget http://repo.continuum.io/miniconda/Miniconda3-3.7.3-Linux-x86_64.sh -O miniconda.sh
   - chmod +x miniconda.sh
   - ./miniconda.sh -b
   - export PATH=/home/travis/miniconda3/bin:$PATH
+  - conda config --system --set always_yes yes --set changeps1 no
   # Update conda itself
-  - conda update --yes conda
+  - conda update conda
+  - conda config --system --add channels defaults
+  - conda config --system --add channels conda-forge
+  - conda config --system --add channels bioconda
 install:
-  - conda create --yes -n env_name python=$PYTHON_VERSION pip flake8 nose scikit-bio
+  - conda create --yes -n env_name python=$TRAVIS_PYTHON_VERSION
+          pip flake8 nose
+          scikit-bio>=0.5.1 fasttree muscle sumaclust click>=4.0
   - source activate env_name
   - pip install coveralls
   - pip install .

README.rst

@@ -3,7 +3,6 @@ ghost-tree
 
 |Build Status| |Coverage Status|
 
-
 ghost-tree is a bioinformatics tool that combines sequence data from two
 genetic marker databases into one phylogenetic tree that can be used for
 diversity analyses. One database is used as a "foundation tree" because it
@@ -17,7 +16,13 @@ contains pre-built reference phylogenetic trees for the `UNITE QIIME reference
 files available here
 <https://unite.ut.ee/repository.php>`_.
 
-The most recent ghost-trees we've created are in our tree repository.
+.. image:: https://github.com/JTFouquier/q2-ghost-tree/blob/master/images/Picture1.png
+Fig 1. Saliva (blue) and restroom (red) ITS sequences compared using binary jaccard, 
+unweighted UniFrac with Muscle aligned ITS sequences, and unweighted UniFrac with a 
+ghost tree created from ITS and 18S sequences.
+
+The most recent ghost-trees we've created are in our tree repository found
+`here <https://github.com/JTFouquier/ghost-tree-trees>`_.
 
 If you use ghost-tree in published research, please cite our `software 
 publication in Microbiome <https://microbiomejournal.biomedcentral.com/articles/10.1186/s40168-016-0153-6>`_. Thank you!