Merge pull request #151 from natalieklein/master

fix import Image in make_montage

Author: agramfort

surfer/viz.py

@@ -73,7 +73,10 @@ def make_montage(filename, fnames, orientation='h', colorbar=None,
     out : array
         The montage image data array.
     """
-    import Image
+    try:
+        import Image
+    except ImportError:
+        from PIL import Image
     # This line is only necessary to overcome a PIL bug, see:
     #     http://stackoverflow.com/questions/10854903/what-is-causing-
     #          dimension-dependent-attributeerror-in-pil-fromarray-function