Merge branch 'master' of https://github.com/biocore/gneiss

README.md

@@ -5,29 +5,29 @@
 
 Canonically pronouced *nice*
 
-gneiss is a compositional statistics and visualization toolbox.  
 
+gneiss is a compositional statistics and visualization toolbox.  
+
 Note that gneiss is not compatible with python 2, and is compatible with Python 3.4 or later.
-gneiss is currently in alpha.  We are actively developing it, and __backward-incompatible interface changes can and will arise__.
+gneiss is currently in alpha.  We are actively developing it, and __backward-incompatible interface changes may arise__.
 
 # Installation
 
-To install this package, it is recommended to setup a conda environment as follows
+To install this package, it is recommended to use conda.  An environment can installed as follows
 
 ```
-conda create -n gneiss_env python=3 pip gneiss
+conda create -n gneiss_env python=3
 ```
 
-You can also install Gneiss via pip
-
+gneiss then can be installed as follows
 ```
+source activate gneiss_env
 pip install gneiss
 ```
 
 To run through the tutorials, you'll need a few more packages, namely `seaborn`, `biom-format` and `h5py`.
 These packages can be installed with conda as follows
 ```
-source activate gneiss
 conda install seaborn h5py
 pip install biom-format
 ```
@@ -37,5 +37,5 @@ pip install biom-format
 IPython notebooks demonstrating some of the modules in gneiss can be found as follows
 
 * [What are balances](https://github.com/biocore/gneiss/blob/master/ipynb/balance_trees.ipynb)
-* [Linear regression on balances](https://github.com/biocore/gneiss/blob/master/ipynb/88soils.ipynb)
-
+* [Linear regression on balances in the 88 soils](https://github.com/biocore/gneiss/blob/master/ipynb/88soils.ipynb)
+* [Linear mixed effects models on balances in a CF study](https://github.com/biocore/gneiss/blob/master/ipynb/cfstudy.ipynb)

gneiss/__init__.py

@@ -12,4 +12,4 @@
 
 __all__ = ['ols', 'mixedlm']
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"