remove a couple features from vimrc
add no-ff to gitconfig