Merge remote-tracking branch 'origin/biofuels' into biofuels

# Conflicts:
#	premise/data_collection.py

premise/ecoinvent_modification.py

@@ -605,7 +605,7 @@ def _fetch_iam_data(scenario):
             scenario["database"] = copy.deepcopy(self.database)
 
         # use multiprocessing to speed up the process
-        #with Pool(processes=multiprocessing.cpu_count()) as pool:
+        # with Pool(processes=multiprocessing.cpu_count()) as pool:
         #    pool.map(_fetch_iam_data, self.scenarios)
 
         for scenario in self.scenarios: