Merge remote-tracking branch 'upstream/master'

Conflicts:
	repository/j.json

repository.json

 {
-	"schema_version": "2.0", 
-	"packages": [], 
+	"schema_version": "2.0",
+	"packages": [],
 	"includes": [
-		"./repository/0-9.json", 
-		"./repository/a.json", 
-		"./repository/b.json", 
-		"./repository/c.json", 
-		"./repository/d.json", 
-		"./repository/e.json", 
-		"./repository/f.json", 
-		"./repository/g.json", 
-		"./repository/h.json", 
-		"./repository/i.json", 
-		"./repository/j.json", 
-		"./repository/k.json", 
-		"./repository/l.json", 
-		"./repository/m.json", 
-		"./repository/n.json", 
-		"./repository/o.json", 
-		"./repository/p.json", 
-		"./repository/q.json", 
-		"./repository/r.json", 
-		"./repository/s.json", 
-		"./repository/t.json", 
-		"./repository/u.json", 
-		"./repository/v.json", 
-		"./repository/w.json", 
-		"./repository/x.json", 
-		"./repository/y.json", 
+		"./repository/0-9.json",
+		"./repository/a.json",
+		"./repository/b.json",
+		"./repository/c.json",
+		"./repository/d.json",
+		"./repository/e.json",
+		"./repository/f.json",
+		"./repository/g.json",
+		"./repository/h.json",
+		"./repository/i.json",
+		"./repository/j.json",
+		"./repository/k.json",
+		"./repository/l.json",
+		"./repository/m.json",
+		"./repository/n.json",
+		"./repository/o.json",
+		"./repository/p.json",
+		"./repository/q.json",
+		"./repository/r.json",
+		"./repository/s.json",
+		"./repository/t.json",
+		"./repository/u.json",
+		"./repository/v.json",
+		"./repository/w.json",
+		"./repository/x.json",
+		"./repository/y.json",
 		"./repository/z.json"
 	]
-}
+}
\ No newline at end of file

repository/0-9.json

 {
-	"schema_version": "2.0", 
+	"schema_version": "2.0",
 	"packages": [
 		{
-			"name": "2pdf", 
-			"details": "https://github.com/fraoustin/Sublime2pdf", 
+			"name": "2pdf",
+			"details": "https://github.com/fraoustin/Sublime2pdf",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "<3000",
 					"details": "https://github.com/fraoustin/Sublime2pdf/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"name": "3024 Color Scheme", 
+			"name": "3024 Color Scheme",
 			"details": "https://github.com/idleberg/3024.tmTheme",
 			"labels": ["color scheme"],
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/idleberg/3024.tmTheme/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"name": "4GL", 
+			"name": "4GL",
 			"details": "https://github.com/skarcha/SublimeText2-4GL",
 			"labels": ["language syntax"],
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/skarcha/SublimeText2-4GL/tree/master"
 				}
 			]

repository/k.json

 {
-	"schema_version": "2.0", 
+	"schema_version": "2.0",
 	"packages": [
 		{
-			"name": "Keep Open On Last Tab Close", 
-			"details": "https://github.com/vprimachenko/Sublime2KeepOpen", 
+			"name": "Keep Open On Last Tab Close",
+			"details": "https://github.com/vprimachenko/Sublime2KeepOpen",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "<3000",
 					"details": "https://github.com/vprimachenko/Sublime2KeepOpen/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"details": "https://github.com/welefen/KeymapManager", 
+			"details": "https://github.com/welefen/KeymapManager",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "<3000",
 					"details": "https://github.com/welefen/KeymapManager/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"name": "Kimbie Color Scheme", 
+			"name": "Kimbie Color Scheme",
 			"details": "https://github.com/idleberg/Kimbie.tmTheme",
 			"labels": ["color scheme"],
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/idleberg/Kimbie.tmTheme/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"details": "https://github.com/aziz/knockdown", 
+			"details": "https://github.com/aziz/knockdown",
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/aziz/knockdown/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"details": "https://github.com/SublimeText/KnowledgeBase", 
+			"details": "https://github.com/SublimeText/KnowledgeBase",
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/SublimeText/KnowledgeBase/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"name": "Kohana", 
-			"details": "https://github.com/Zeelot/sublime-kohana", 
+			"name": "Kohana",
+			"details": "https://github.com/Zeelot/sublime-kohana",
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/Zeelot/sublime-kohana/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"name": "Kohana 2.x Snippets", 
+			"name": "Kohana 2.x Snippets",
 			"details": "https://github.com/golf3gtiii/Kohana234-sublimeText2-plugin",
 			"labels": ["snippets"],
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/golf3gtiii/Kohana234-sublimeText2-plugin/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"name": "Koken", 
-			"details": "https://github.com/koken/koken-sublime", 
+			"name": "Koken",
+			"details": "https://github.com/koken/koken-sublime",
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/koken/koken-sublime/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"name": "Kotlin", 
-			"details": "https://github.com/vkostyukov/kotlin-sublime-package", 
+			"name": "Kotlin",
+			"details": "https://github.com/vkostyukov/kotlin-sublime-package",
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/vkostyukov/kotlin-sublime-package/tree/master"
 				}
 			]
-		}, 
+		},
 		{
-			"name": "KWrite Color Scheme", 
+			"name": "KWrite Color Scheme",
 			"details": "https://github.com/daris/sublime-kwrite-color-scheme",
 			"labels": ["color scheme"],
 			"releases": [
 				{
-					"sublime_text": "*", 
+					"sublime_text": "*",
 					"details": "https://github.com/daris/sublime-kwrite-color-scheme/tree/master"
 				}
 			]