Added/removed some comments, added .gitignore, removed another .swp that snuck in