Cleanup, updated .gitignore