0
@@ -104,20 +104,3 @@ end
0
 helper :network_page_for do |user|
0
   "https://github.com/#{user}/#{project}/network"
0
 end
0
-
0
-helper :has_launchy? do |blk|
0
-  begin
0
-    gem 'launchy'
0
-    require 'launchy'
0
-    blk.call
0
-  rescue Gem::LoadError
0
-    STDERR.puts "Sorry, you need to install launchy: `gem install launchy`"
0
-  end
0
-end
0
-
0
-helper :open do |url|
0
-  has_launchy? proc {
0
-    Launchy::Browser.new.visit url
0
-  }
0
-end
0
-

0
@@ -108,9 +108,17 @@ module GitHub
0
     if file[0] == ?/
0
       path = file
0
     else
0
+      # if both exist, we want to load both
0
       path = BasePath + "/commands/#{command_name}/#{file}"
0
-      unless File.exists?(path)
0
-        path = BasePath + "/commands/#{file}"
0
+      path2 = BasePath + "/commands/#{file}"
0
+      if File.exists?(path)
0
+        if File.exists?(path2)
0
+          data = File.read(path)
0
+          GitHub.module_eval data, path
0
+          path = path2
0
+        end
0
+      else
0
+        path = path2
0
       end
0
     end
0
     data = File.read(path)