Merge branch 'master' of github.com:biocore/qiita into samplesanalysis

Author: squirrelo

.travis.yml

@@ -10,7 +10,7 @@ before_install:
   # Update conda itself
   - conda update --yes conda
 install:
-  - conda create --yes -n env_name python=$PYTHON_VERSION pip nose pep8 openpyxl=1.8.2
+  - conda create --yes -n env_name python=$PYTHON_VERSION pip nose pep8 openpyxl=1.8.2 pandas
   - source activate env_name
   - pip 
   - pip install coveralls