Git hook changes
Fix vimrc conflict
Fix .gitignore error