Moved RequireJS snippets into javascript.snippets.

The two snippets are at the end of javascript.snippets, and the javascript_requirejs.snippets file has been deleted.

UltiSnips/javascript.snippets

@@ -115,4 +115,14 @@ snippet ctrace "console.trace"
 console.trace();
 endsnippet
 
+# RequireJS snippets
+
+snippet def "Boilerplate for calling define" !w
+define(${1:optional_name, }[${2:'jquery'}], ${3:callback});
+endsnippet
+
+snippet req "Boilerplate for calling require" !w
+require([${1:'dependencies'}], ${2:callback});
+endsnippet
+
 # vim:ft=snippets:

UltiSnips/javascript_requirejs.snippets

@@ -1,7 +0,0 @@
-snippet def "Boilerplate for calling define" !w
-define(${1:optional_name, }[${2:'jquery'}], ${3:callback});
-endsnippet
-
-snippet req "Boilerplate for calling require" !w
-require([${1:'dependencies'}], ${2:callback});
-endsnippet