Whee.
Merge pull request #14 from michelleful/master

Let's try this again