Some bug fixes and performance improvements.
Updated gitignore to include vim swap files.