Commented out global exceptions from gitignore file
Merge branch 'master' into trusty