Merge branch 'master' into develop

Author: dan-blanchard

tests/test_gridmap.py

@@ -24,7 +24,6 @@
 
 import logging
 
-import gridmap
 from gridmap import Job, process_jobs, grid_map
 
 from nose.tools import eq_
@@ -34,8 +33,7 @@
 logging.captureWarnings(True)
 logging.basicConfig(format=('%(asctime)s - %(name)s - %(levelname)s - ' +
                             '%(message)s'), level=logging.DEBUG)
-logger = logging.getLogger(__name__)
-logger.debug('Path to gridmap: %s', gridmap)
+
 
 def compute_factorial(n):
     ret = 1