Update .gitignore round 2
Removed trailing whitespace
Merge branch 'master' into nik