Merge branch 'weakmaps' of github.com:thomaswilburn/Caret into weakmaps

Conflicts:
	config/user.json
	js/sessions.js

js/sessions.js

@@ -58,7 +58,7 @@ define([
       }
       tabContainer.append(element);
     });
-    
+
     setTimeout(function() {
       //wait for render before triggering the enter animation
       tabContainer.findAll(".enter").forEach(function(element) { element.removeClass("enter") });
@@ -142,4 +142,4 @@ define([
     renderTabs: renderTabs
   }
 
-});
+});