Slight change to .gitignore
Removed artificats of screwed up .gitignore
Merge branch 'fixed-gitignore'