Update README.markdown
Merge branch 'master' into pydoc_in_view