Git ignore *.swo. Added tab commands to vim.txt.
Merge branch 'dev'