added gvim (renamed macvim) to bin/
added git autocompletion
updated gpup and vim plugins
updated gpup. added comments
updated gitconfig
added cdiff function
added aha

see https://github.com/theZiz/aha
made cleandiff into a function