Updated gitignore
Merge branch 'master' into jeroen