eager loading has_one fix

I believe I have fixed the issue Trevor noted with has_one (http://rails.lighthouseapp.com/projects/8994/tickets/64-eager-loading-inconsistency) if people would like to have a look.

Fred