Add warning about or behavior w/filters; fixes #498
Merge branch 'master' of github.com:rethinkdb/docs