Merge pull request #1 from jorygraham/master

Turns out I don't have a global .gitignore