Cleaned up swp and other nonsense
Merge branch 'master' of https://github.com/dansofe0r/inim