Update .gitignore.

Closes #6
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'