Added .swp to ignorefiles
Merge branch 'master' of https://github.com/derphilipp/dotfiles