Removed .swp file from repo
Merge branch 'master' of github.com:logorrhea/source-tree