merge with my local vimrc
added undo-commit alias