Merge branch 'master' of github.com:joneshf/package_control_channel into joneshf-master

Conflicts:
	repositories.json

repositories.json

@@ -516,7 +516,7 @@
 		"https://github.com/JohnNilsson/awk-sublime",
 		"https://github.com/jonasdp/Snipplr",
 		"https://github.com/jonbons/Sublime-SQF-Language",
-		"https://github.com/joneshf/RoyCompile",
+		"https://github.com/joneshf/sublime-roy",
 		"https://github.com/jonlabelle/Trimmer",
 		"https://github.com/jonny64/ludik",
 		"https://github.com/jonschlinkert/pre-sublime",
@@ -1728,6 +1728,7 @@
 		"sublime-rmate": "Rmate",
 		"sublime-robot-plugin" : "Robot Framework",
 		"Sublime-Rosetta-Get": "Rosetta Code Snippets",
+		"sublime-roy": "Roy",
 		"sublime-rst-completion": "Restructured Text (RST) Snippets",
 		"sublime-rust": "Rust",
 		"sublime-rvm": "RVM",
@@ -2137,6 +2138,7 @@
 		"Python Package to Clipboard": "Python Path to Clipboard",
 		"Quick File Renamer": "QuickFileMove",
 		"Quick Rails": "QuickRails",
+		"RoyCompile": "Roy",
 		"Ruby 1.9 Hash Converter": "Ruby Hash Converter",
 		"Ruby 1.9 Hash Reverter": "Ruby Hash Reverter",
 		"Six: Future JavaScript Syntax": "Six - Future JavaScript Syntax",