use _contains rather than _indexOf where appropriate
Merge pull request #532 from davidchambers/contains

use _contains rather than _indexOf where appropriate