Merge branch 'master' into 0.2.x

Conflicts:
	doc/source/conf.py
	doc/source/tutorial.rst
	setup.py
	sima/__init__.py
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