renamed .vim and .vimrc so they're visible
Merge branch 'revert'