Merge pull request #1287 from kstrauser/master

Conflicts:
	repositories.json

repositories.json

@@ -1114,6 +1114,7 @@
 		"https://raw.github.com/jfromaniello/sublime-unity-recents/master/packages.json",
 		"https://raw.github.com/joeyespo/sublimetext-console-exec/master/packages.json",
 		"https://raw.github.com/joomlapro/joomla3-sublime-snippets/master/packages.json",
+		"https://raw.github.com/jvantuyl/sublime_diagram_plugin/master/packages.json",
 		"https://raw.github.com/jpswelch/sublime-google-tasks/master/packages.json",
 		"https://raw.github.com/kairyou/SublimeTmpl/master/packages.json",
 		"https://raw.github.com/Kaizhi/SublimeUpdater/master/packages.json",
@@ -1781,6 +1782,7 @@
 		"Sublime2KeepOpen": "Keep Open On Last Tab Close",
 		"Sublime2pdf": "2pdf",
 		"sublime_context_build": "ContextBuild",
+		"sublime_diagram_plugin": "Diagram",
 		"sublime_drush": "Drush",
 		"sublime_file_switcher": "File Switcher",
 		"sublime_guard": "Guard",