Updated .gitignore
Merge master into dev to get new .gitignore