initial Haskell support.
On Windows, the fallback command (g:ctrlp_user_command) should be "dir" instead of "find" (#381).
Merge pull request #382 from nesmyslny/fix-ctrlp-fallback-cmd_#381

CtrlP doesn't find files on Windows (#381)
autocmd lines should be moved to the .vimrc file as per advice from spf13-vim upstream.
Issue #341 Cursor on first line for git commit msg
Use https links where possible

I've gone through the entire repository, checking all http:// links to
see if the corresponding https urls would also work. This is especially
important when asking the user to run a script they fetched via curl,
because in the case of a mitm they will have no way at all to detect
that something malicious is going on.
Merge pull request #385 from keelerm84/set-position-for-gitcommit

Issue #341 Cursor on first line for git commit msg
Merge pull request #377 from victoredwardocallaghan/3.0

initial Haskell support.
better lineending and tab character
Set sh as the default shell.

Some people use non-POSIX shells. Vim has trouble with non-POSIX login shells.
Merge pull request #388 from GaelanS/patch-1

Set sh as the default shell.
Remove quotes around /bin/sh.
Merge pull request #390 from GaelanS/sh-quote-fi

Remove quotes around /bin/sh.
added diablo3 color scheme (and lemon256)
use fast buffer switching and fast error switching
set diablo3 color scheme as default
Merge pull request #386 from shahn/3.0

Use https links where possible
Add support for detecting .coffee files.
Add note about dependencies
Merge remote-tracking branch 'upstream/3.0' into 3.0

Conflicts:
	bootstrap.sh