Cleanup .gitignore; mv .samples to /config
Fix .gitignore merging conflicts