Sprint 2 updates and .gitignore fixes