changing default editor to vim
giMerge branch 'master' of github.com:bbttxu/dotfiles