Fix minor doc typo.
Merge branch 'master' of localhost:/opt/git/sima
Merge branch 'master' of localhost:/opt/git/sima
Setup support for develop
Merge branch 'master' of 156.111.43.151:/opt/git/sima
Removed compiled cython files
Adjustments to travis script
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
Merge branch 'master' into 0.2.x

Conflicts:
	doc/source/conf.py
	doc/source/tutorial.rst
	setup.py
	sima/__init__.py
Merge branch 'master' into 0.3.x
Doc improvements
Merge branch '0.2.x' into 0.3.x

Improved docs.

Conflicts:
	doc/source/conf.py
	doc/source/index.rst
	doc/source/tutorial.rst
	setup.py
	sima/__init__.py