Refactored VIM and GIT settings