ignore some random vim files
Merge branch 'master' of https://github.com/arcin/dotfiles
fix merge conflicts