Gitconfig and vimrc changes

- Changes default push strategy to 'current'. 'Tracking' is deprecated
- Added a few new bundles to vim
Changed to solarized-dark in vim
Fixes merged conflict