Ignore vim swap files and improve regex