Username fix for windows-nt
Merge pull request #366 from shanmuha/master

Username fix for windows-nt
Adds web-mode and prelude module.
Merge pull request #368 from climatewarrior/add-web-mode

Adds web-mode as prelude module.
Fix issue disabling white-space-mode.
Merge pull request #369 from climatewarrior/add-web-mode

Fix issue disabling white-space-mode.
Fixed username (in windows-nt) in the final message after loading prelude.
Merge pull request #370 from shanmuha/master

Fixed username (in windows-nt) in the final message after loading prelud...
Disable ido's annoying auto-merging of directories if no match is found
Always auto-skip closing pair
Pull in upstream changes