[git] fix mergetool :) and some core.autocrlf / whitespace stuff
[vim] remove old surround and SyntaxFolds
Added vim-surround as submodule
Always create an SSH agent
[bash] Added aliases: gsh,gsp for Git; page; md5sha1
[git] gitconfig changes

Conflicts:

	conf/git/gitconfig
[bash] prefs: added clr_yellow, the history trick, and bindings for pgup/pgdown
[vim] scala files should have sw=2
[vim] added after-settings for AutoClose and surround
[vim] scala after ftplugin settings