Use .rst instead of .md for PyPI
Merge branch 'dev'