Update .gitignore
Merge branch 'master' into interface
Remove unneeded .gitignore options
Merge branch 'master' into interface