gitignore and manifest cleanup
merge