Ignore vim swap files
Tidied up and removed some ambiguity & repetition