Provide a default to the second argument, as per Rails 3.x
Merge pull request #3 from cliochris/fix_has_one

Provide a default to the second argument, as per Rails 3.x