sync from upstream
removing garbage
adding new ignored files
Merge pull request #1 from andersonlf/master

adding new ignored files to .gitignore