Split lines to make pylint happier
Ignore vim swap files
Begin chopping up into separate files