Merge pull request #3 from marcbowes/master

Make it so that `rake test` works