Use extracted resolver.

The .travis.yml changes allow for Travis to test against both the bundled
resolver and the current master version.

When an update is ready to be pulled in (and vendored) simply run:

``` rake update_resolver
```