Add .vim folder
remove .swp files
Merge branch 'master' of github.com:JustinJ/dotfiles