Updating .gitignore to the new directory scheme
Merge branch 'master' into math