edit .vimrc
edit dotfile
Revert "edit .vimrc"

This reverts commit 453929f403195352d6f95ecdf57eb15b0c8e3cef.
edit .vimrc
Merge branch 'dev_131025'