Add Twinside/vim-haskellFold

Better folding for Haskell:
https://github.com/Twinside/vim-haskellFold
Update .vimrc.bundles

According to line 94 and the Bundle name here, it should be Scala, not Java
Update bootstrap.sh
Merge pull request #584 from Cade-Forester/patch-1

Prevent stopping installation process: disable 'more' option
Merge pull request #582 from ljie-PI/patch-1

Update .vimrc.bundles
Merge pull request #571 from x0l/patch-1

Add Twinside/vim-haskellFold
Merge remote-tracking branch 'upstream/3.0' into 3.0

* upstream/3.0:
  Update bootstrap.sh
  Update .vimrc.bundles
  Add Twinside/vim-haskellFold

Conflicts:
	bootstrap.sh