Add useful merge aliases to gitconfig; props @robmiller
Whitespace
Add NERDTree
Update git aliases for viewing merge commits
Add bindings for NERDTree and visual column for 72 chars