Add README.rst
Use README.rst instead of README.md
Merge branch 'master' into local

Conflicts:
	setup.py