Update .gitignore.
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from ardneran/master

Update .gitignore.