Search for the data directory using argv[0] *and* os.Executable()

Search for the data directory using argv[0] *and* os.Executable() #2060