Tidy up of WALS2SQL, better separation of responsibilities between WALS2SQL, removal of duplicate code.
Ignore vi swap files.