Error with reload in rails 3

In Rails 3 calling reload on a AR object returns an error. This is because the def for reload is:

reload(options = nil)

prepare_for_find_or_count does not take this into consideration when it pushes the options back on the args.

This patch just does a test and removes the nil if it exists.

I got a load error when I tried to run the tests so please do run them. If there's an issue I can work through the load error and sort it out.