Update .gitignore to handle new settings structure.
Merge branch 'twoscoops/round1'