[.gitconfig] Add default --no-ff for git merge
[.vimrc] Remove CoffeeScript mappings for delete and dedent