Clean up vimrc
Update .gitignore