Cleanup .gitignore; mv .samples to /config
Fix .gitignore merging conflicts
Merge branch 'upstream'
Reapply modifs to project .gitignore