fix merge conflicts

Author: technocake

README.md

@@ -24,14 +24,23 @@ $ goto github
 
 ### Setup
 
-#### Mac OS-X / Linux
+#### Mac OS-X / Linux / Win (git bash)
 ```
 pip install magicgoto
 ```
 After install, close and reopen your terminal.
 
 #### Windows (using gitbash)
-Do the same as above, but **open git bash as Administrator**
+Open git bash and do the same as above.
+
+
+git bash is included when you install git on windows usually.
+
+Some git bash installs comes without any rcfile. 
+If you get this error: `Ah hoy! Failed to determine rcfile...` 
+you can fix it by running`touch ~/.bash_profile` and then `install_goto`
+
+
 
 
 #### Linux - User Site install

goto/commands/__init__.py

@@ -13,6 +13,16 @@
         commands[name] = command
 
 
-usage, _ = help.run(None,None,None,None)
+def usage():
+    '''
+        Making this a procedure to avoid  that the help_text could
+        be outdated if any later methods inject plugins or other commands.
+
+        This will evaluate the help text for all
+        installed commands.
+    '''
+    help_text, _ = help.run(None, None, None, None)
+    return help_text
+
 
 __all__ = ['usage', 'commands', 'commands_list']

goto/the_real_goto.py

@@ -17,6 +17,7 @@
 from .plugins import plugins
 
 
+
 def main():
     fix_python2()
     make_sure_we_print_in_utf8()
@@ -65,15 +66,18 @@ def exit_if_unhealthy():
 
 def exit_with_usage_if_needed():
     if len(sys.argv) < 3:
-        print_utf8(usage)
+        print_usage()
         exit(0)
 
 
 def exit_if_no_command_and_no_args(command, args):
     if not command and len(args) == 0:
-        print_utf8(usage)
+        print_usage()
         exit(0)
 
 
+def print_usage():
+    print_utf8(usage())
+
 if __name__ == '__main__':
     main()