Update doc for elpy, fix a minor issue.
Merge remote-tracking branch 'ome/master'