Changed gitignore template to be more specific.
Merged .gitignore