Add *swp to .gitignore.
Merge branch 'master' of https://github.com/Do/charlock_holmes