Fix up .gitignore to ignore generated dirs, and remove generated dirs from git