Add dSYM to global gitignore.
Fix GOROOT on OS X.
Update vundle.
Add prolog syntax highlight to vimrc.
Use vimdiff as git merge tool.