Tweaked .gitignore.
Merge branch 'Kris_gitignore' into develop