diff --git a/Cmder.bat b/Cmder.bat
index c806d6a..18d9ff0 100644
--- a/Cmder.bat
+++ b/Cmder.bat
@@ -8,4 +8,4 @@ if exist "%~1" (
     start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1"
 ) else (
     start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"
-)
\ No newline at end of file
+)
diff --git a/vendor/init.bat b/vendor/init.bat
index fa4b403..9b66cf5 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -37,7 +37,7 @@
     set "GIT_INSTALL_ROOT=%ProgramFiles%\Git"
 ) else if exist "%ProgramFiles(x86)%\Git" (
     set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git"
-) else if exist "%CMDER_ROOT%\vendor" (
+) else if exist "%CMDER_ROOT%\vendor\git-for-windows" (
     set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
 )
 
@@ -49,7 +49,7 @@
 )
 
 :: Enhance Path
-@set PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%
+@set PATH=%CMDER_ROOT%\bin;%PATH%;%CMDER_ROOT%\
 
 :: Add aliases
 @doskey /macrofile="%CMDER_ROOT%\config\aliases"
@@ -70,7 +70,7 @@
 @if defined CMDER_START (
     @cd /d "%CMDER_START%"
 ) else (
-    @if "%CD%\" == "%CMDER_ROOT%" (
+    @if "%CD%\" == "%CMDER_ROOT%\" (
         @cd /d "%HOME%"
     )
 )
diff --git a/vendor/profile.ps1 b/vendor/profile.ps1
index 499fc83..b668fa6 100644
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@@ -24,6 +24,12 @@ if( -not $env:PSModulePath.Contains($CmderModulePath) ){
     $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
 }
 
+try {
+    Get-command -Name "vim" -ErrorAction Stop >$null
+} catch {
+    $env:Path += ";$env:CMDER_ROOT\vendor\git-for-windows\usr\share\vim\vim74"
+}
+
 try {
     # Check if git is on PATH, i.e. Git already installed on system
     Get-command -Name "git" -ErrorAction Stop >$null
diff --git a/vendor/sources.json b/vendor/sources.json
index 69f9ab6..c0e6cb6 100644
--- a/vendor/sources.json
+++ b/vendor/sources.json
@@ -1,8 +1,8 @@
 [
     {
         "name": "git-for-windows",
-        "version": "v2.6.2.windows.1",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.6.2.windows.1/PortableGit-2.6.2-32-bit.7z.exe"
+        "version": "v2.6.3.windows.1",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.6.3.windows.1/PortableGit-2.6.3-32-bit.7z.exe"
     },
     {
         "name": "clink",
@@ -11,8 +11,8 @@
     },
     {
         "name": "conemu-maximus5",
-        "version": "151025",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.10.25/ConEmuPack.151025.7z"
+        "version": "151109",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v15.11.09/ConEmuPack.151109.7z"
     },
     {
         "name": "clink-completions",