Cleans and improves gitconfig

* uses system gitconfig by default (to avoid $HOME issues)
* diff3 for better conflict resolution
* fixup/squash alias
* uses native commit count for `head` alias
Cleans and update vim setup

* install system-wide
* changes powerline to vim-airline
* removes unused bundles
Updates git prompt