Merge branch 'refs/heads/upstream', removed bad links

Conflicts:
	repositories.json

repositories.json

@@ -4,47 +4,75 @@
 		"https://github.com/SublimeText",
 		"http://sublime.wbond.net/packages.json",
 		"https://bitbucket.org/CDuke/sublime-tfs",
+		"https://bitbucket.org/Clams/pasteselonclick",
 		"https://bitbucket.org/Clams/sublimepastecolumn",
 		"https://bitbucket.org/Clams/sublimesystemverilog",
+		"https://bitbucket.org/cryzed/sweylas-color-theme-generator",
 		"https://bitbucket.org/homura/whitespacecorrector",
 		"https://bitbucket.org/nwjlyons/copy-file-name",
 		"https://bitbucket.org/nwjlyons/google-search",
 		"https://bitbucket.org/pjv/setdjangosyntax",
 		"https://bitbucket.org/sublimator/sublime-2-zencoding",
+		"https://bitbucket.org/thejeshgn/hg4subl",
 		"https://github.com/aaronpowell/sublime-jquery-snippets",
 		"https://github.com/aaronpowell/Sublime-KnockoutJS-Snippets",
+		"https://github.com/akira-cn/sublime-v8",
+		"https://github.com/akira-cn/sublime-gbk",
+		"https://github.com/akrabat/SublimeFunctionNameDisplay",
 		"https://github.com/alek-sys/ChangeTracker",
 		"https://github.com/alek-sys/sublimetext_indentxml",
 		"https://github.com/alexnj/SublimeOnSaveBuild",
 		"https://github.com/alexstaubo/sublime_text_alternative_autocompletion",
+		"https://github.com/a1fred/SublimeGoogle",
 		"https://github.com/allixsenos/SublimeMRU",
+		"https://github.com/alnkpa/sublimeprolog",
 		"https://github.com/ameyp/CscopeSublime",
+		"https://github.com/Anomareh/PHP-Twig.tmbundle",
 		"https://github.com/aparajita/Cappuccino-Sublime",
+		"https://github.com/atadams/Hex-to-HSL-Color",
 		"https://github.com/Azd325/sublime-text-caniuse",
 		"https://github.com/balazstth/subl-esp",
-		"https://github.com/bgreenlee/sublime-github",
+		"https://github.com/belike81/Sublime-File-Navigator",
+		"https://github.com/berfarah/LESS-build-sublime",
+		"https://github.com/biermeester/Pylinter",
+		"https://github.com/billymoon/LoremIpsum",
+		"https://github.com/bizoo/MultiTaskBuild",
 		"https://github.com/bmc/ST2EmacsMiscellanea",
+		"https://github.com/bmc/ST2SyntaxFromFileName",
 		"https://github.com/BoundInCode/AutoFileName",
 		"https://github.com/BoundInCode/Display-Functions",
+		"https://github.com/brandonhilkert/TomDoc-Sublime",
+		"https://github.com/BrianGilbert/Sublime-Text-2-Goto-Drupal-API",
 		"https://github.com/brianriley/sublime-dpaste",
 		"https://github.com/buymeasoda/soda-theme",
-		"https://github.com/cgutierrez/sublime-text-js-minifier",
+		"https://github.com/ccreutzig/sublime-MuPAD",
+		"https://github.com/cgutierrez/JsMinifier",
 		"https://github.com/chagel/itodo",
 		"https://github.com/clemos/haxe-sublime2-bundle",
 		"https://github.com/clintberry/sublime-text-2-ini",
 		"https://github.com/condemil/Gist",
 		"https://github.com/CraigWilliams/BeautifyRuby",
 		"https://github.com/CraigWilliams/TestChooser",
+		"https://github.com/crazycooder/Caret-History",
+		"https://github.com/crazycooder/Goto-Symbol",
+		"https://github.com/cyphactor/sublime_guard",
 		"https://github.com/cyrilf7/Sublimipsum",
+		"https://github.com/dangelov/hasher",
 		"https://github.com/danro/LESS-sublime",
 		"https://github.com/daris/sublime-kwrite-color-scheme",
 		"https://github.com/davepeck/DirectorySettings",
+		"https://github.com/dexnode/sublime-yii-snippets",
+		"https://github.com/dhoelzgen/iced-coffee-script-tmbundle",
 		"https://github.com/DisposaBoy/GoSublime",
+		"https://github.com/Drarok/rsub",
 		"https://github.com/dz0ny/LiveReload-sublimetext2",
+		"https://github.com/dzhibas/SublimePrettyJson",
 		"https://github.com/eddorre/SublimeERB",
 		"https://github.com/ehamiter/ST2-GitHubinator",
 		"https://github.com/ericmartel/Sublime-Text-2-Perforce-Plugin",
 		"https://github.com/ericmartel/Sublime-Text-2-Stackoverflow-Plugin",
+		"https://github.com/ericmartel/Sublime-Text-2-Search-Anywhere-Plugin",
+		"https://github.com/ericmartel/Sublime-Text-2-CSV-Plugin",
 		"https://github.com/Etsur/EE-ST2",
 		"https://github.com/fabiocorneti/SublimeTextGitX",
 		"https://github.com/facelessuser/BracketHighlighter",
@@ -52,53 +80,89 @@
 		"https://github.com/facelessuser/RegReplace",
 		"https://github.com/fbzhong/sublime-closure-linter",
 		"https://github.com/fbzhong/sublime-jslint",
+		"https://github.com/fmartini/sublime-rust",
+		"https://github.com/FPtje/Sublime-GLua-Highlight",
+		"https://github.com/fushnisoft/SublimeClarion",
+		"https://github.com/geoffroymontel/supercollider-package-for-sublime-text",
 		"https://github.com/gja/sublime-text-2-jasmine",
+		"https://github.com/grundprinzip/sublemacspro",
 		"https://github.com/jashkenas/coffee-script-tmbundle",
 		"https://github.com/jbrooksuk/SublimeWebColors",
+		"https://github.com/jclement/SublimePandoc",
 		"https://github.com/jdc0589/CaseConversion",
 		"https://github.com/jdc0589/JsFormat",
+		"https://github.com/jmm/Sublime-Text-Block-Nav/tree/package-control",
+		"https://github.com/jmm/Sublime-Text-Cycle-Setting/tree/package-control",
 		"https://github.com/juhasz/drupal_sublime-snippets",
 		"https://github.com/JulianEberius/SublimeRope",
 		"https://github.com/kemayo/sublime-text-2-clipboard-history",
 		"https://github.com/kemayo/sublime-text-2-git",
 		"https://github.com/kemayo/sublime-text-2-goto-documentation",
 		"https://github.com/khiltd/Abacus",
+		"https://github.com/Kindari/SublimeXdebug",
 		"https://github.com/kizza/CSS-Less-ish",
 		"https://github.com/kuroir/SCSS.tmbundle/tree/SublimeText2",
 		"https://github.com/kutu/RandomMessage",
 		"https://github.com/kvs/ST2EmacsModelines",
 		"https://github.com/kvs/ST2Nginx",
+		"https://github.com/Ky6uk/SublimeDancer",
+		"https://github.com/leon/YUI-Compressor",
+		"https://github.com/LewisW/SublimeAutoSemiColon",
+		"https://github.com/liamr/Zurb-Foundation-Textmate-Bundle",
 		"https://github.com/lunixbochs/sublimelint",
 		"https://github.com/luqman/SublimeText2RailsRelatedFiles",
 		"https://github.com/maltize/sublime-text-2-moo",
 		"https://github.com/maltize/sublime-text-2-ruby-tests",
+		"https://github.com/Michal-Mikolas/Nette-package-for-Sublime-Text-2",
 		"https://github.com/minism/SublimeBufmod",
 		"https://github.com/minism/SublimeLove",
+		"https://github.com/misfo/Shell-Turtlestein",
 		"https://github.com/mitsuhiko/jinja2-tmbundle",
+		"https://github.com/mneuhaus/SublimeFileTemplates",
+		"https://github.com/mpmont/ci-snippets",
 		"https://github.com/mrmartineau/HTML5",
 		"https://github.com/mrmartineau/Placeholders",
+		"https://github.com/nathos/sass-textmate-bundle/tree/sublime",
 		"https://github.com/Nijikokun/Prevu",
+		"https://github.com/noklesta/SublimeQuickFileCreator",
 		"https://github.com/noklesta/SublimeRailsNav",
 		"https://github.com/NorthIsUp/Sublimation",
 		"https://github.com/oleander/sublime-split-navigation",
 		"https://github.com/Paaskehare/pastebin-sublime-plugin",
 		"https://github.com/paccator/GotoRecent",
+		"https://github.com/PhilippSchaffrath/phpInstant",
 		"https://github.com/phillipkoebbe/DetectSyntax",
+		"https://github.com/phuibonhoa/handcrafted-haml-textmate-bundle",
 		"https://github.com/purplefish32/sublime-text-2-twig",
 		"https://github.com/purplefish32/sublime-text-2-wordpress",
+		"https://github.com/quarnster/ADBView",
 		"https://github.com/quarnster/SublimeClang",
 		"https://github.com/quarnster/SublimeGDB",
 		"https://github.com/radiosilence/dogs-colour-scheme",
+		"https://github.com/raik/st2-pseudo-osx-theme",
+		"https://github.com/raulfraile/sublime-symfony2",
 		"https://github.com/reflog/toggle-readonly",
+		"https://github.com/remcoder/SublimeHandcraft",
+		"https://github.com/revolunet/sublimetext-html-export",
+		"https://github.com/revolunet/sublimetext-markdown-preview",
+		"https://github.com/revolunet/sublimetext-web-encoders",
+		"https://github.com/rioderaca/LaTeX-Track-Changes",
 		"https://github.com/rmaksim/Sublime-Text-2-Goto-CSS-Declaration",
 		"https://github.com/rmaksim/Sublime-Text-2-Inc-Dec-Value",
 		"https://github.com/robcowie/SublimePaster",
 		"https://github.com/robcowie/SublimeTODO",
 		"https://github.com/rozboris/Sublime-Tweet",
+		"https://github.com/rrerolle/sublime-scheme-cycler",
 		"https://github.com/rspec/rspec-tmbundle",
+		"https://github.com/sagework/cucumber-sublime2-bundle",
+		"https://github.com/saippuakauppias/sublime-text-2-Django-DocsSearch",
+		"https://github.com/samsonw/SublimeTask",
 		"https://github.com/sentience/HyperlinkHelper",
-		"https://github.com/sepidev/ValaForSublime",
+		"https://github.com/silentworks/modx-sublimetext-2",
+		"https://github.com/skarcha/SublimeText2-4GL",
+		"https://github.com/skoch/Sublime-ActionScript-3",
 		"https://github.com/skt84/Themr",
+		"https://github.com/sobstel/SyncedSideBar",
 		"https://github.com/spadgos/sublime-AsAbove",
 		"https://github.com/spadgos/sublime-csspecific",
 		"https://github.com/spadgos/sublime-DefaultFileType",
@@ -107,95 +171,205 @@
 		"https://github.com/spadgos/sublime-SplitScreen",
 		"https://github.com/spadgos/sublime-ToggleQuotes",
 		"https://github.com/squ1b3r/Djaneiro",
+		"https://github.com/stuartherbert/sublime-phix-color-scheme",
+		"https://github.com/stuartherbert/sublime-phpsnippets",
+		"https://github.com/stuartherbert/sublime-phpunit",
+		"https://github.com/Stuk/sublime-edit-history",
+		"https://github.com/Taecho/Sublime-Snipt",
 		"https://github.com/tanepiper/sublime-todomanager",
 		"https://github.com/tanepiper/SublimeText-Nodejs",
 		"https://github.com/technocoreai/SublimeExternalCommand",
 		"https://github.com/titoBouzout/SideBarEnhancements",
+		"https://github.com/trishume/Sublime-Rosetta-Get",
+		"https://github.com/tomasztunik/Sublime-Text-2-Backbone.js-package",
+		"https://github.com/uipoet/sublime-jshint",
+		"https://github.com/UnicornForest/Unity3D",
+		"https://github.com/UnicornForest/Unity3DScriptReference",
+		"https://github.com/UnicornForest/Unity3DSnippets",
+		"https://github.com/victorporof/Sublime-HTMLPrettify",
+		"https://github.com/victorporof/Sublime-JSHint",
+		"https://github.com/viisual/ASCII-Decorator",
 		"https://github.com/virtix/sublime-text-2-mxunit",
+		"https://github.com/vojtajina/sublime-OpenRelated",
+		"https://github.com/voventus/AVR-ASM-Sublime",
+		"https://github.com/welefen/KeymapManager",
+		"https://github.com/welovewordpress/SublimeHtmlTidy",
+		"https://github.com/welovewordpress/SublimePhpTidy",
+		"https://github.com/welovewordpress/SublimeWordPressCodex",
 		"https://github.com/witsch/SublimePythonTidy",
+		"https://github.com/wulftone/sublime-text-2-quick-file-move",
+		"https://github.com/Xaro/SublimeSendToPasteBin",
+		"https://github.com/xobb1t/Sublime-AdvancedNewFile",
+		"https://github.com/zerok/Sublime2-SwitchLanguage",
+		"https://github.com/zyxar/Sublime-CMakeLists",
+		"https://raw.github.com/bgreenlee/sublime-github/master/packages.json",
 		"https://raw.github.com/colinta/sublime_packages/master/packages.json",
+		"https://raw.github.com/crazycooder/Goto-Symbol/master/package-control.json",
+		"https://raw.github.com/crazycooder/Caret-History/master/package-control.json",
 		"https://raw.github.com/csytan/sublime-text-2-github/master/packages.json",
 		"https://raw.github.com/darinmorrison/sublime-packages/master/packages.json",
 		"https://raw.github.com/freewizard/sublime_packages/master/package_control.json",
-		"https://raw.github.com/indynagpal/coldfusion-sublime-text-2/master/package_control.json",
+		"https://raw.github.com/gcollazo/sublime_packages/master/packages.json",
 		"https://raw.github.com/jeffturcotte/sublime_packages/master/packages.json",
 		"https://raw.github.com/Kronuz/SublimeCodeIntel/master/package_control.json",
-		"https://raw.github.com/aparajita/SublimeLinter_package_control/master/package_control.json",
+		"https://raw.github.com/Kronuz/SublimeLinter/master/package_control.json",
+		"https://raw.github.com/theadamlt/sublime_packages/master/packages.json",
 		"https://raw.github.com/tiger2wander/sublime_packages/master/packages.json",
-		"https://raw.github.com/weslly/sublime_packages/master/packages.json"
+		"https://raw.github.com/timonwong/sublime_packages/master/packages.json",
+		"https://raw.github.com/weslly/sublime_packages/master/packages.json",
+		"http://wuub.net/packages.json"
 	],
 	"package_name_map": {
+		"ASCII-Decorator": "ASCII Decorator",
 		"Cappuccino-Sublime": "Cappuccino",
+		"Caret-History": "Caret History",
 		"CaseConversion": "Case Conversion",
 		"ChangeTracker": "Change Tracker",
+		"ci-snippets": "CodeIgniter Snippets",
 		"coffee-script-tmbundle": "CoffeeScript",
 		"CscopeSublime": "Cscope",
 		"CSS-Less-ish": "CSS Less(ish)",
+		"cucumber-sublime2-bundle": "Cucumber",
 		"DirectorySettings": "Directory Settings",
 		"Display-Functions": "Display Functions (Java)",
 		"dogs-colour-scheme": "Dogs Colour Scheme",
 		"drupal_sublime-snippets": "Drupal Snippets",
 		"EE-ST2": "ExpressionEngine",
+		"Goto-Symbol": "Goto Symbol",
+		"Sublime-GLua-Highlight": "GMod Lua",
+		"handcrafted-haml-textmate-bundle": "Haml",
+		"hasher": "Hasher",
 		"haxe-sublime2-bundle" : "HaXe",
+		"Hex-to-HSL-Color": "Hex to HSL Color Converter",
+		"iced-coffee-script-tmbundle" : "IcedCoffeeScript",
 		"itodo": "iTodo",
 		"jinja2-tmbundle": "Jinja2",
+		"LaTeX-Track-Changes": "LaTeX Track Changes",
+		"LESS-build-sublime": "LESS-build",
 		"LESS-sublime": "LESS",
 		"LiveReload-sublimetext2": "LiveReload",
+		"modx-sublimetext-2": "MODx Revolution Snippets",
+		"Nette-package-for-Sublime-Text-2": "Nette",
+		"pasteselonclick": "PasteSelOnClick",
+		"PHP-Twig.tmbundle": "PHP-Twig",
+		"phpInstant": "phpInstant Execute",
 		"RandomMessage": "Random Message",
 		"rspec-tmbundle": "RSpec (snippets and syntax)",
+		"sass-textmate-bundle": "Sass",
 		"SCSS.tmbundle": "SCSS",
+		"Shell-Turtlestein": "Shell Turtlestein",
 		"setdjangosyntax": "SetDjangoSyntax",
 		"soda-theme": "Theme - Soda",
 		"ST2-GitHubinator": "GitHubinator",
+		"st2-pseudo-osx-theme": "Theme - Pseudo OSX",
 		"ST2EmacsMiscellanea": "Miscellaneous Emacs Commands",
 		"ST2EmacsModelines": "Emacs-like Modelines",
 		"ST2Nginx": "nginx",
 		"subl-esp": "ESP (EcmaScript Pages) Edit Mode",
 		"sublime-2-zencoding": "ZenCoding",
+		"Sublime 2 ZenCoding": "ZenCoding",
+		"Sublime-ActionScript-3": "ActionScript 3",
+		"Sublime-AdvancedNewFile": "AdvancedNewFile",
 		"sublime-AsAbove": "AsAbove",
+		"Sublime-CMakeLists": "CMake",
 		"sublime-DefaultFileType": "Default File Type",
+		"sublime-docblox" : "DocBlox",
+		"sublime-edit-history": "Edit History",
+		"Sublime-File-Navigator": "Sublime File Navigator",
+		"sublime-gbk" : "GBK Encoding Support",
 		"sublime-jquery-snippets": "jQuery Snippets pack",
 		"sublime-jsdocs": "DocBlockr",
+		"sublime-jshint": "JSHint",
 		"sublime-kwrite-color-scheme": "KWrite Color Scheme",
 		"sublime-OpenRecentFiles" : "Open Recent Files",
+		"sublime-OpenRelated": "Open Related",
+		"sublime-phix-color-scheme": "Phix Color Scheme",
+		"sublime-phpcs" : "Phpcs",
+		"sublime-phpsnippets": "Additional PHP Snippets",
+		"sublime-phpunit" : "PHPUnit",
+		"Sublime-Rosetta-Get" : "Rosetta Code Snippets",
+		"sublime-rust": "Rust",
+		"sublime-scheme-cycler": "SchemeCycler",
+		"Sublime-Snipt": "Snipt.net",
 		"sublime-SplitScreen": "SplitScreen",
+		"sublime-symfony2": "Symfony2 Snippets",
+		"Sublime-Text-2-Backbone.js-package": "Backbone.js",
 		"sublime-text-2-clipboard-history": "Clipboard History",
+		"Sublime-Text-2-CSV-Plugin" : "CSV",
+		"sublime-text-2-Django-DocsSearch": "Django-DocsSearch",
 		"sublime-text-2-git": "Git",
 		"sublime-text-2-github": "GitHub.app Menu",
 		"Sublime-Text-2-Goto-CSS-Declaration": "Goto-CSS-Declaration",
 		"sublime-text-2-goto-documentation": "Goto Documentation",
+		"Sublime-Text-2-Goto-Drupal-API": "Goto Drupal API",
 		"Sublime-Text-2-Inc-Dec-Value": "Inc-Dec-Value",
 		"sublime-text-2-ini": "INI",
 		"sublime-text-2-jasmine": "Jasmine",
 		"sublime-text-2-moo": "Moo",
 		"sublime-text-2-mxunit": "MXUnit",
 		"Sublime-Text-2-Perforce-Plugin" : "Perforce",
+		"sublime-text-2-quick-file-move": "QuickFileMove",
 		"sublime-text-2-ruby-tests": "RubyTest",
+		"Sublime-Text-2-Search-Anywhere-Plugin" : "Search Anywhere",
 		"Sublime-Text-2-Stackoverflow-Plugin" : "Search Stack Overflow",
 		"sublime-text-2-twig" : "Twig",
 		"sublime-text-2-wordpress": "Wordpress",
+		"Sublime-Text-Block-Nav" : "Block Nav",
 		"sublime-text-caniuse": "Can I Use",
-		"sublime-text-js-minifier": "JS Minifier",
+		"Sublime-Text-Cycle-Setting" : "Cycle Setting",
 		"sublime-tfs" : "Sublime TFS",
 		"sublime-todomanager" : "Todo Manager",
 		"sublime-ToggleQuotes": "ToggleQuotes",
 		"Sublime-Tweet": "Sublime Tweet",
+		"sublime-v8" : "Sublime V8",
+		"sublime-yii-snippets": "Yii Framework Snippets",
+		"sublime_guard" : "Guard",
 		"sublime_text_alternative_autocompletion": "alternative_autocompletion",
+		"Sublime2-SwitchLanguage": "SwitchLanguage",
+		"SublimeAutoSemiColon" : "Auto Semi-Colon",
 		"SublimeERB": "ERB Insert and Toggle Commands",
+		"SublimeFunctionNameDisplay" : "Function Name Display",
+		"SublimeHtmlTidy": "HtmlTidy",
+		"SublimePandoc": "Pandoc (Markdown)",
 		"sublimepastecolumn": "Paste as Column",
+		"SublimePasteColumn": "Paste as Column",
+		"SublimePhpTidy": "PhpTidy",
+		"SublimeWordPressCodex": "Search WordPress Codex",
+		"SublimePrettyJson": "Pretty JSON",
 		"SublimePythonTidy": "PythonTidy",
+		"SublimeQuickFileCreator": "Quick File Creator",
 		"SublimeRailsNav": "Simple Rails Navigator",
+		"SublimeTask": "Task",
+		"SublimeFileTemplates": "FileTemplates",
+		"SublimeSendToPasteBin": "SendToPasteBin",
 		"sublimesystemverilog": "SystemVerilog",
+		"SublimeSystemVerilog": "SystemVerilog",
+		"sublimetext-html-export": "HTML Export",
+		"sublimetext-markdown-preview": "Markdown Preview",
 		"SublimeText-Nodejs": "Nodejs",
+		"sublimetext-web-encoders": "Web Encoders",
 		"SublimeText2RailsRelatedFiles": "Rails Related Files",
+		"SublimeText2-4GL": "4GL",
 		"sublimetext_indentxml": "Indent XML",
+		"sublimeprolog": "Prolog",
+		"SublimeXdebug": "Xdebug",
+		"supercollider-package-for-sublime-text": "SuperCollider",
+		"sweylas-color-theme-generator": "Sweyla's Color Theme Generator",
 		"toggle-readonly" : "Toggle Read-Only",
-		"ValaForSublime" : "Vala",
-		"whitespacecorrector" : "Whitespace Corrector"
+		"TomDoc-Sublime" : "TomDoc",
+		"Unity3D" : "Unity3D",
+		"Unity3DScriptReference" : "Unity3D Script Reference Search",
+		"Unity3DSnippets" : "Unity3D Snippets and Completes",
+		"whitespacecorrector" : "Whitespace Corrector",
+		"Whitespacecorrector" : "Whitespace Corrector",
+		"YUI-Compressor": "YUI Compressor",
+		"Zurb-Foundation-Textmate-Bundle": "Zurb Foundation Snippets"
 	},
 	"renamed_packages": {
 		"IncDecValue": "Inc-Dec-Value",
 		"JSDocs": "DocBlockr",
+		"JS Minifier": "JsMinifier",
+		"Quick File Renamer": "QuickFileMove",
 		"SublimeBracketeer" : "Bracketeer",
 		"SublimeMoveText": "MoveText",
 		"SublimeQuickfind": "Quickfind",