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

Preparatory to 1.8.0 branch.