add more gitignore
nit
merge master