Fixed some gitignore paths that were files instead of directories.
Merge branch 'mustard' into dummy