Merge is inevitable because of new test created and test suite was changed

Merge branch 'develop' into test_surface_tallies

docs/source/usersguide/geometry.rst

@@ -19,7 +19,7 @@ surface is a locus of zeros of a function of Cartesian coordinates
 :math:`x,y,z`, e.g.
 
 - A plane perpendicular to the :math:`x` axis: :math:`x - x_0 = 0`
-- A cylinder perpendicular to the :math:`z` axis: :math:`(x - x_0)^2 + (y -
+- A cylinder parallel to the :math:`z` axis: :math:`(x - x_0)^2 + (y -
   y_0)^2 - R^2 = 0`
 - A sphere: :math:`(x - x_0)^2 + (y - y_0)^2 + (z - z_0)^2 - R^2 = 0`
 

docs/source/usersguide/install.rst

@@ -401,14 +401,6 @@ distributions.
       NumPy is used extensively within the Python API for its powerful
       N-dimensional array.
 
-   `h5py <http://www.h5py.org/>`_
-      h5py provides Python bindings to the HDF5 library. Since OpenMC outputs
-      various HDF5 files, h5py is needed to provide access to data within these
-      files from Python.
-
-.. admonition:: Optional
-   :class: note
-
    `SciPy <https://www.scipy.org/>`_
       SciPy's special functions, sparse matrices, and spatial data structures
       are used for several optional features in the API.
@@ -417,6 +409,14 @@ distributions.
       Pandas is used to generate tally DataFrames as demonstrated in
       :ref:`examples_pandas` example notebook.
 
+   `h5py <http://www.h5py.org/>`_
+      h5py provides Python bindings to the HDF5 library. Since OpenMC outputs
+      various HDF5 files, h5py is needed to provide access to data within these
+      files from Python.
+
+.. admonition:: Optional
+   :class: note
+
    `Matplotlib <http://matplotlib.org/>`_
       Matplotlib is used to providing plotting functionality in the API like the
       :meth:`Universe.plot` method and the :func:`openmc.plot_xs` function.