Merge branch 'master' into wip-color-mc

Conflicts:
	common.py
	gen/generator.py
	run/experiment.py
	run_exps.py

1 files changed, 2 insertions, 2 deletions

diff --git a/parse/col_map.py b/parse/col_map.py
index ceb8867..59484e8 100644
--- a/parse/col_map.py
+++ b/parse/col_map.py
@@ -22,7 +22,7 @@ class ColMapBuilder(object):
 
 class ColMap(object):
     def __init__(self, col_list, values = None):
-        self.col_list = col_list
+        self.col_list = sorted(col_list)
         self.rev_map = {}
         self.values = values
 
@@ -50,7 +50,7 @@ class ColMap(object):
             if col not in kv:
                 key += (None,)
             else:
-                key += (kv[col],)
+                key += (str(kv[col]),)
 
         return key