Merge remote-tracking branch 'upstream/master'

Conflicts:
	repository/j.json

channel.json

@@ -20,7 +20,6 @@
 		"https://raw.github.com/Andr3as/Sublime-SurroundWith/master/packages.json",
 		"https://raw.github.com/angular-ui/AngularJS-sublime-package/master/packages.json",
 		"https://raw.github.com/aparajita/active4d-sublime/master/package_control.json",
-		"https://raw.github.com/aponxi/sublime-better-coffeescript/master/package.json", 
 		"https://raw.github.com/apophys/sublime-packages/master/packages.json",
 		"https://raw.github.com/bits/ExpandSelectionToWhitespace-SublimeText/master/packages.json",
 		"https://raw.github.com/blachniet/sublime-mimosa/master/packages.json",
@@ -121,7 +120,6 @@
 		"https://raw.github.com/sentience/DokuWiki/master/packages.json",
 		"https://raw.github.com/sentience/HyperlinkHelper/master/packages.json",
 		"https://raw.github.com/shivkumarganesh/VisSub/master/packages.json",
-		"https://raw.github.com/sindresorhus/sublime-jsrun/master/packages.json", 
 		"https://raw.github.com/smpanaro/sublime-spotify/master/packages.json",
 		"https://raw.github.com/sokolovstas/SublimeWebInspector/master/packages.json",
 		"https://raw.github.com/soncy/AutoComments-for-Sublime-Text-2/master/packages.json",

repository/a.json

@@ -614,7 +614,12 @@
 		{
 			"name": "Autoprefixer",
 			"details": "https://github.com/sindresorhus/sublime-autoprefixer",
-			"labels": ["text manipulation"],
+			"homepage": "https://github.com/sindresorhus/sublime-autoprefixer",
+			"labels": [
+				"text manipulation",
+				"prefix",
+				"css"
+			],
 			"releases": [
 				{
 					"sublime_text": "*",

repository/b.json

@@ -155,6 +155,20 @@
 				}
 			]
 		},
+		{
+			"name": "Better CoffeeScript",
+			"details": "https://github.com/aponxi/sublime-better-coffeescript",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/aponxi/sublime-better-coffeescript/tree/st2"
+				},
+				{
+					"sublime_text": ">2999",
+					"details": "https://github.com/aponxi/sublime-better-coffeescript/tree/master"
+				}
+			]
+		},
 		{
 			"name": "Better JavaScript",
 			"details": "https://github.com/int3h/sublime-better-javascript",

repository/c.json

@@ -746,7 +746,7 @@
 			"details": "https://github.com/ehuss/Sublime-Column-Select",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/ehuss/Sublime-Column-Select/tree/master"
 				}
 			]

repository/e.json

@@ -71,7 +71,13 @@
 		{
 			"name": "EditorConfig",
 			"details": "https://github.com/sindresorhus/editorconfig-sublime",
-			"labels": ["linting", "text manipulation"],
+			"homepage": "https://github.com/sindresorhus/editorconfig-sublime",
+			"labels": [
+				"linting",
+				"text manipulation",
+				"formatting",
+				"code style"
+			],
 			"releases": [
 				{
 					"sublime_text": "*",
@@ -480,6 +486,16 @@
 				"EE Add-On Builder"
 			]
 		},
+		{
+			"name": "ExtendScript",
+			"details": "https://github.com/seblavoie/sublime-extendscript",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/seblavoie/sublime-extendscript/tags"
+				}
+			]
+		},
 		{
 			"name": "eZ Publish Syntax",
 			"details": "https://github.com/SirReal/eZ-Publish-Syntax",

repository/f.json

@@ -320,7 +320,12 @@
 		{
 			"name": "Focus",
 			"details": "https://github.com/sindresorhus/focus",
-			"labels": ["color scheme"],
+			"homepage": "https://github.com/sindresorhus/focus",
+			"labels": [
+				"color scheme",
+				"markup",
+				"latex"
+			],
 			"releases": [
 				{
 					"sublime_text": "*",
@@ -333,7 +338,7 @@
 			"details": "https://github.com/eproxus/focus_last_tab",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/eproxus/focus_last_tab/tree/master"
 				}
 			]

repository/i.json

@@ -169,6 +169,18 @@
 				}
 			]
 		},
+		{
+      			"name": "IPS Syntax",
+      			"details": "https://github.com/Skullmonkey/IPS-Syntax/tree/master/IPS",
+      			"author": "Matt C",
+      			"labels": ["language syntax"],
+			"releases": [
+              			{
+                  			"sublime_text": "*",
+                  			"details": "https://github.com/Skullmonkey/IPS-Syntax/tree/master"
+              			}
+      			]
+    		},
 		{
 			"details": "https://github.com/SublimeText/Issues",
 			"releases": [

repository/j.json

@@ -150,6 +150,7 @@
 			]
 		},
 		{
+<<<<<<< HEAD
 			"name": "Jedi Python autocompetion", 
 			"previous_names": ["SublimeJEDI"],
 			"details": "https://github.com/srusskih/SublimeJEDI", 
@@ -365,6 +366,24 @@
 				}
 			]
 		},
+		{
+			"name": "JsRun",
+			"details": "https://github.com/sindresorhus/sublime-jsrun",
+			"homepage": "https://github.com/sindresorhus/sublime-jsrun",
+			"labels": [
+				"browser integration",
+				"repl",
+				"javascript",
+				"browser"
+			],
+			"releases": [
+				{
+					"platforms": ["osx"],
+					"sublime_text": "*",
+					"details": "https://github.com/sindresorhus/sublime-jsrun/tree/master"
+				}
+			]
+		},
 		{
 			"name": "Julia",
 			"details": "https://github.com/epitron/Julia-sublime",

repository/l.json

@@ -188,7 +188,7 @@
 			"details": "https://github.com/compleatang/Legal-Markdown-Sublime",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/compleatang/Legal-Markdown-Sublime/tree/master"
 				}
 			]
@@ -415,7 +415,7 @@
 			"details": "https://github.com/emmetio/livestyle-sublime",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/emmetio/livestyle-sublime/tree/master"
 				}
 			]

repository/p.json

@@ -170,7 +170,7 @@
 			"details": "https://github.com/compleatang/sublimetext-pastepdf",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/compleatang/sublimetext-pastepdf/tree/master"
 				}
 			]
@@ -889,16 +889,6 @@
 				}
 			]
 		},
-		{
-			"name": "Python IDE", 
-			"details": "https://github.com/JulianEberius/SublimePythonIDE", 
-			"releases": [
-				{
-					"sublime_text": ">=3000", 
-					"details": "https://github.com/JulianEberius/SublimePythonIDE/tree/master"
-				}
-			]
-		}, 
 		{
 			"name": "Python Imports Sorter",
 			"details": "https://github.com/vi4m/sublime_python_imports",

repository/s.json

@@ -205,7 +205,7 @@
 			"labels": ["language syntax"],
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/MarioRicalde/SCSS.tmbundle/tree/SublimeText2"
 				}
 			]
@@ -499,9 +499,10 @@
 		{
 			"name": "Simple Print Function",
 			"details": "https://github.com/svenax/SublimePrint",
+			"labels": ["printing"],
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/svenax/SublimePrint/tree/master"
 				}
 			]
@@ -675,7 +676,7 @@
 			"details": "https://github.com/demon386/SmartMarkdown",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/demon386/SmartMarkdown/tree/master"
 				}
 			]
@@ -1482,6 +1483,18 @@
 				}
 			]
 		},
+		{
+			"details": "https://github.com/JulianEberius/SublimePythonIDE",
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"details": "https://github.com/JulianEberius/SublimePythonIDE/tree/master"
+				}
+			],
+			"previous_names": [
+				"Python IDE"
+			]
+		},
 		{
 			"details": "https://bitbucket.org/klorenz/sublimerestructuredtext",
 			"releases": [

repository/t.json

@@ -677,7 +677,7 @@
 			"details": "https://github.com/Nalum/Touch-WSGI",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/Nalum/Touch-WSGI/tree/master"
 				}
 			]

repository/w.json

@@ -295,7 +295,7 @@
 			"details": "https://github.com/ehuss/Sublime-Wrap-Plus",
 			"releases": [
 				{
-					"sublime_text": "<3000", 
+					"sublime_text": "*",
 					"details": "https://github.com/ehuss/Sublime-Wrap-Plus/tree/master"
 				}
 			]