Update files, ignore vim/bundle, remove netbeans
git mergetool, setup script