Merge branch 'master' into release-0.7.0

Author: dmolsen

core/lib/PatternLab/Configurer.php

@@ -63,7 +63,7 @@ public function getConfig() {
 		}
 
 		// check the config version and update it if necessary
-		if (!isset($config["v"]) || ($config["v"] != $defaultConfig["v"])) {
+		if ($migrate || ($config["v"] != $defaultConfig["v"])) {
 			print "upgrading your version of pattern lab...\n";
 			$config = $this->writeNewConfig($config,$defaultConfig);
 			$diffVersion = true;

core/templates/styleguide.mustache

@@ -44,4 +44,4 @@
 			// handle injection of items from PHP
 			var patternPartial = "";
 			var lineage = "";
-		</script>
+		</script>

core/templates/viewall.mustache

@@ -46,4 +46,4 @@
 			var patternPartial = "{{ patternPartial }}";
 			var lineage = "";
 		</script>
-		
+