update rails 2 branch

 - making tests run
 - no-such-feature improvement
 - do not fail with nil ids
 - find_features
 - do not do 1+all when using cache_warming (new)

@jamesarosen