Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev

Conflicts:
	.coveragerc
	.gitignore
	.travis.yml
	docs/api_Utils.rst
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py

tests/em/test_Examples.py

@@ -0,0 +1,10 @@
+import unittest, os
+from SimPEG.EM import Examples
+
+class EM_ExamplesRunning(unittest.TestCase):
+
+    def test_CylInversion(self):
+        Examples.CylInversion.run(plotIt=False)
+
+if __name__ == '__main__':
+    unittest.main()