Reorganize vimrc & more

Fix bug in jshintrc
Fix indentation in gitconfig
Add new bundles to vimrc
Reorganize and update vimrc