Changed .gitignore to be exactly what the boss has said.
Merge branch 'hotfix-gitignore'