Update gitconfig, merge/difftools + keepBackup=false

http://stackoverflow.com/questions/1251681/diff-tool-generates-unwanted-orig-files
DOCKER_HOST for Mac OS X
Add typescript syntax highlighting to vim
Add ruby syntax highlight to vim