Merge branch 'develop' of https://github.com/simpeg/simpeg into quadtree

SimPEG/Mesh/DiffOperators.py

@@ -644,3 +644,7 @@ class DiffOperators(object):
     def getFaceMassDeriv(self):
         Av = self.aveF2CC
         return Av.T * sdiag(self.vol)
+
+    def getEdgeMassDeriv(self):
+        Av = self.aveE2CC
+        return Av.T * sdiag(self.vol)

SimPEG/Mesh/TensorView.py

@@ -404,7 +404,7 @@ class TensorView(object):
         ::
 
             def function(var, ax, clim, tlt, i):
-                tlt.set_text('%%d'%%i)
+                tlt.set_text('%d'%i)
                 return mesh.plotImage(var, imageType='CC', ax=ax, clim=clim)
 
             mesh.video([model1, model2, ..., modeln],function)