Remove files that should not be tracked
Consolidate gitignore