Update .gitignore
Merge pull request #5 from tomislater/patch-1

Update .gitignore
Merge pull request #1 from tumblr/master

Update for master branch