Merge pull request #1 from jessenic/master

Better .gitignore and .gitattributes