two additions
reconcile with .swp file (thanks, Recover.vim)
Merge branch 'master' of github.com:JamesLavin/my_tech_resources