Merge branch 'dev' of https://github.com/simpeg/simpeg into mt/dev

Conflicts:
	SimPEG/Utils/meshutils.py
	docs/index.rst
	tests/mesh/test_MeshIO.py

docs/examples/EM_FDEM_Analytic_MagDipoleWholespace.rst

@@ -0,0 +1,26 @@
+.. _examples_EM_FDEM_Analytic_MagDipoleWholespace:
+
+.. --------------------------------- ..
+..                                   ..
+..    THIS FILE IS AUTO GENEREATED   ..
+..                                   ..
+..    SimPEG/Examples/__init__.py    ..
+..                                   ..
+.. --------------------------------- ..
+
+
+EM: Magnetic Dipole in a Whole-Space
+====================================
+
+Here we plot the magnetic flux density from a harmonic dipole in a wholespace.
+
+
+
+.. plot::
+
+    from SimPEG import Examples
+    Examples.EM_FDEM_Analytic_MagDipoleWholespace.run()
+
+.. literalinclude:: ../../SimPEG/Examples/EM_FDEM_Analytic_MagDipoleWholespace.py
+    :language: python
+    :linenos:

docs/examples/EM_TDEM_1D_Inversion.rst

@@ -1,4 +1,4 @@
-.. _examples_EM_FDEM_1D_Inversion:
+.. _examples_EM_TDEM_1D_Inversion:
 
 .. --------------------------------- ..
 ..                                   ..
@@ -9,18 +9,18 @@
 .. --------------------------------- ..
 
 
-EM: FDEM: 1D: Inversion
+EM: TDEM: 1D: Inversion
 =======================
 
-Here we will create and run a FDEM 1D inversion.
+Here we will create and run a TDEM 1D inversion.
 
 
 
 .. plot::
 
     from SimPEG import Examples
-    Examples.EM_FDEM_1D_Inversion.run()
+    Examples.EM_TDEM_1D_Inversion.run()
 
-.. literalinclude:: ../../SimPEG/Examples/EM_FDEM_1D_Inversion.py
+.. literalinclude:: ../../SimPEG/Examples/EM_TDEM_1D_Inversion.py
     :language: python
     :linenos:

docs/flow/index.rst

@@ -41,7 +41,7 @@ Here we reproduce the results from Celia et al. (1990):
 Richards
 ========
 
-.. automodule:: simpegFLOW.Richards.Empirical
+.. automodule:: SimPEG.FLOW.Richards.Empirical
     :show-inheritance:
     :members:
     :undoc-members:

docs/index.rst

@@ -44,6 +44,13 @@ About SimPEG
    api_bigPicture
    api_installing
 
+Examples
+********
+
+.. toctree::
+   :maxdepth: 2
+   api_Examples
+
 Packages
 ********
 
@@ -54,15 +61,6 @@ Packages
    mt/index
    flow/index
 
-Examples
-********
-
-.. toctree::
-   :maxdepth: 2
-
-   api_Examples
-
-
 Finite Volume
 *************