Added vim *.swp files to gitignore
Merge branch 'master' of github.com:scottohara/dotfiles