DOC: Merge doc updates from http://docs.scipy.org/numpy/patch/.

Preparatory to 1.8.0 branch.
Merge pull request #3622 from charris/merge-1.8-docs

DOC: Merge doc updates from http://docs.scipy.org/numpy/patch/.