add .gitignore
Update README.md
merge with master upstream
fix relative path in .gitignore
Merge branch 'master' into stacks