added support for 'or_where' to the find() options array
fixed complex find_by queries, mixing "and" and "or"