dont use JAVA_HOME
special handling for backup/undo/swap vim dirs
new vundle settings
merge from office
ignoring the vim/viminfo file