cleaning up the git ignores.
Merge branch 'fix_git_ignore' into develop