[gdb] Use simple prompt

fixes gdb in emacs with bogus color codes everywhere. Also we don't need
super fancy prompts guys seriously it's gdb.
[gitconfig] Update mergepoint and ol aliases

Now they actually work, and look better!