Update to roi.mask
bug fix in setup.py
Switched conda to miniconda in .travis.yml
Revert "bug fix in setup.py"

This reverts commit 4fa257d34827b25072247f60de77e613cb54e9c3.
Clean up .travis.yml
added cython step to INSTALL.rst
.travis.yml changes
Merge branch 'master' into 3D_SIMA

Conflicts:
	sima/ROI.py
Merge branch 'master' into 3D_SIMA